From ce251417f5a30173bdc2225732c9f52607299795 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Thu, 20 Jun 2019 10:57:07 -0600 Subject: [PATCH] curve25519 in get_curve_name when HAVE_ECC not defined. Thanks to C.B. for the report. --- src/ssl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index d74c59b1e..58df549fb 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -16524,15 +16524,20 @@ const char* wolfSSL_get_curve_name(WOLFSSL* ssl) { if (ssl == NULL) return NULL; + #ifdef HAVE_FFDHE if (ssl->namedGroup != 0) return wolfssl_ffdhe_name(ssl->namedGroup); #endif + +#ifdef HAVE_CURVE25519 + if (ssl->ecdhCurveOID == ECC_X25519_OID) + return "X25519"; +#endif + #ifdef HAVE_ECC if (ssl->ecdhCurveOID == 0) return NULL; - if (ssl->ecdhCurveOID == ECC_X25519_OID) - return "X25519"; return wc_ecc_get_name(wc_ecc_get_oid(ssl->ecdhCurveOID, NULL, NULL)); #else return NULL;