Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.3-stable] Resolves naming conflicts between variable names and c++ identifiers-"new" #658

Open
wants to merge 2 commits into
base: 8.3-stable
Choose a base branch
from
Open

[8.3-stable] Resolves naming conflicts between variable names and c++ identifiers-"new" #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b39e1ef
Resolves naming conflicts between variable names and c++ identifiers-…
smfc99 Oct 14, 2024
6a366a8
Resolves naming conflicts between variable names and c++ identifiers-…
smfc99 Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto/evp/kdf_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ EVP_KDF_CTX *EVP_KDF_CTX_new_id(int id)
return NULL;
}

if (kmeth->new != NULL && (ret->impl = kmeth->new()) == NULL) {
if (kmeth->new_impl != NULL && (ret->impl = kmeth->new_impl()) == NULL) {
EVP_KDF_CTX_free(ret);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion include/crypto/evp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ extern const EVP_PKEY_METHOD eia3_pkey_meth;
typedef struct evp_kdf_impl_st EVP_KDF_IMPL;
typedef struct {
int type;
EVP_KDF_IMPL *(*new) (void);
EVP_KDF_IMPL *(*new_impl) (void);
void (*free) (EVP_KDF_IMPL *impl);
void (*reset) (EVP_KDF_IMPL *impl);
int (*ctrl) (EVP_KDF_IMPL *impl, int cmd, va_list args);
Expand Down
Loading