wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2290 from kaleb-himes/ZD-5253-X25519

Browse Source 
Support CURVE25519 in `get_curve_name` when HAVE_ECC not defined
This commit is contained in:
toddouska
2019-06-24 15:37:34 -07:00
committed by GitHub
parent 358757cd2e c114bcaead
commit c7964b62c0
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ssl.c
View File

@ -16522,21 +16522,31 @@ static const char* wolfssl_ffdhe_name(word16 group)
*/
const char* wolfSSL_get_curve_name(WOLFSSL* ssl)
{
const char* cName = NULL;
if (ssl == NULL)
return NULL;
#ifdef HAVE_FFDHE
if (ssl->namedGroup != 0)
return wolfssl_ffdhe_name(ssl->namedGroup);
if (ssl->namedGroup != 0) {
cName = wolfssl_ffdhe_name(ssl->namedGroup);
}
#endif
#ifdef HAVE_CURVE25519
if (ssl->ecdhCurveOID == ECC_X25519_OID && cName == NULL) {
cName = "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;
if (ssl->ecdhCurveOID != 0 && cName == NULL) {
cName = wc_ecc_get_name(wc_ecc_get_oid(ssl->ecdhCurveOID, NULL,
NULL));
}
#endif
return cName;
}
#endif