shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

libcrypto.c: Change function parameter name

Browse Source 
"new" is a c++ keyword which will make the build fail.

Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 23cebfadea)
This commit is contained in:
Norbert Pocs
2022-10-23 19:42:16 +02:00
committed by Andreas Schneider
parent e218745d0e
commit 2c03f3bd0b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libssh/wrapper.h
View File

@@ -126,9 +126,9 @@ const char *ssh_hmac_type_to_string(enum ssh_hmac_e hmac_type, bool etm);
#if defined(HAVE_LIBCRYPTO) && OPENSSL_VERSION_NUMBER >= 0x30000000L #if defined(HAVE_LIBCRYPTO) && OPENSSL_VERSION_NUMBER >= 0x30000000L
int evp_build_pkey(const char* name, OSSL_PARAM_BLD *param_bld, EVP_PKEY **pkey, int selection); int evp_build_pkey(const char* name, OSSL_PARAM_BLD *param_bld, EVP_PKEY **pkey, int selection);
int evp_dup_dsa_pkey(const ssh_key key, ssh_key new, int demote); int evp_dup_dsa_pkey(const ssh_key key, ssh_key new_key, int demote);
int evp_dup_rsa_pkey(const ssh_key key, ssh_key new, int demote); int evp_dup_rsa_pkey(const ssh_key key, ssh_key new_key, int demote);
int evp_dup_ecdsa_pkey(const ssh_key key, ssh_key new, int demote); int evp_dup_ecdsa_pkey(const ssh_key key, ssh_key new_key, int demote);
#endif /* HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER */ #endif /* HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER */
#ifdef __cplusplus #ifdef __cplusplus

12
src/libcrypto.c
View File

@@ -1573,19 +1573,19 @@ static int evp_dup_pkey(const char* name, const ssh_key key, int demote,
return SSH_OK; return SSH_OK;
} }
int evp_dup_dsa_pkey(const ssh_key key, ssh_key new, int demote) int evp_dup_dsa_pkey(const ssh_key key, ssh_key new_key, int demote)
{ {
return evp_dup_pkey("DSA", key, demote, new); return evp_dup_pkey("DSA", key, demote, new_key);
} }
int evp_dup_rsa_pkey(const ssh_key key, ssh_key new, int demote) int evp_dup_rsa_pkey(const ssh_key key, ssh_key new_key, int demote)
{ {
return evp_dup_pkey("RSA", key, demote, new); return evp_dup_pkey("RSA", key, demote, new_key);
} }
int evp_dup_ecdsa_pkey(const ssh_key key, ssh_key new, int demote) int evp_dup_ecdsa_pkey(const ssh_key key, ssh_key new_key, int demote)
{ {
return evp_dup_pkey("EC", key, demote, new); return evp_dup_pkey("EC", key, demote, new_key);
} }
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */