Addressed peer feedback, avoid double check when HAVE_CURVE25519 not set

pull/2290/head
kaleb-himes 2019-06-21 09:40:17 -06:00
parent 49a631996c
commit c114bcaead
1 changed files with 7 additions and 9 deletions

View File

@ -16533,9 +16533,8 @@ const char* wolfSSL_get_curve_name(WOLFSSL* ssl)
}
#endif
if (cName == NULL) {
#ifdef HAVE_CURVE25519
if (ssl->ecdhCurveOID == ECC_X25519_OID) {
if (ssl->ecdhCurveOID == ECC_X25519_OID && cName == NULL) {
cName = "X25519";
}
#endif
@ -16546,7 +16545,6 @@ const char* wolfSSL_get_curve_name(WOLFSSL* ssl)
NULL));
}
#endif
}
return cName;
}