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

Remove HAVE_OPENSSL_X25519 ifdefs

Browse Source 
X25519 is implicitly included in new (>1.1.1) openssl version, no need
to check it explicitly.

Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Norbert Pocs
2022-10-11 15:45:54 +02:00
committed by Jakub Jelen
parent 358ce46551
commit 66d3afd0ab
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/curve25519.c
View File

@@ -39,7 +39,7 @@
#include "libssh/pki.h" #include "libssh/pki.h"
#include "libssh/bignum.h" #include "libssh/bignum.h"
#if defined(HAVE_LIBCRYPTO) && defined(HAVE_OPENSSL_X25519) #ifdef HAVE_LIBCRYPTO
#include <openssl/err.h> #include <openssl/err.h>
#endif #endif
@@ -59,7 +59,7 @@ static struct ssh_packet_callbacks_struct ssh_curve25519_client_callbacks = {
static int ssh_curve25519_init(ssh_session session) static int ssh_curve25519_init(ssh_session session)
{ {
int rc; int rc;
#if defined(HAVE_LIBCRYPTO) && defined(HAVE_OPENSSL_X25519) #ifdef HAVE_LIBCRYPTO
EVP_PKEY_CTX *pctx = NULL; EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
size_t pubkey_len = CURVE25519_PUBKEY_SIZE; size_t pubkey_len = CURVE25519_PUBKEY_SIZE;
@@ -136,7 +136,7 @@ static int ssh_curve25519_init(ssh_session session)
crypto_scalarmult_base(session->next_crypto->curve25519_client_pubkey, crypto_scalarmult_base(session->next_crypto->curve25519_client_pubkey,
session->next_crypto->curve25519_privkey); session->next_crypto->curve25519_privkey);
} }
#endif /* defined(HAVE_LIBCRYPTO) && defined(HAVE_OPENSSL_X25519) */ #endif /* HAVE_LIBCRYPTO */
return SSH_OK; return SSH_OK;
} }
@@ -176,7 +176,7 @@ static int ssh_curve25519_build_k(ssh_session session)
{ {
ssh_curve25519_pubkey k; ssh_curve25519_pubkey k;
#if defined(HAVE_LIBCRYPTO) && defined(HAVE_OPENSSL_X25519) #ifdef HAVE_LIBCRYPTO
EVP_PKEY_CTX *pctx = NULL; EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY *pkey = NULL, *pubkey = NULL; EVP_PKEY *pkey = NULL, *pubkey = NULL;
size_t shared_key_len = sizeof(k); size_t shared_key_len = sizeof(k);
@@ -255,7 +255,7 @@ out:
crypto_scalarmult(k, session->next_crypto->curve25519_privkey, crypto_scalarmult(k, session->next_crypto->curve25519_privkey,
session->next_crypto->curve25519_server_pubkey); session->next_crypto->curve25519_server_pubkey);
} }
#endif /* defined(HAVE_LIBCRYPTO) && defined(HAVE_OPENSSL_X25519) */ #endif /* HAVE_LIBCRYPTO */
bignum_bin2bn(k, CURVE25519_PUBKEY_SIZE, &session->next_crypto->shared_secret); bignum_bin2bn(k, CURVE25519_PUBKEY_SIZE, &session->next_crypto->shared_secret);
if (session->next_crypto->shared_secret == NULL) { if (session->next_crypto->shared_secret == NULL) {