feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fixes to resolve building --enable-tls13 --disable-ecc --enable-curve25519 --enable-ed25519.

Browse Source
This commit is contained in:
David Garske
2018-04-24 13:39:38 -07:00
parent 089e1b6b9b
commit 3c684886ad
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tls.c
View File

@@ -5701,22 +5701,24 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
curve25519_key* key = (curve25519_key*)keyShareEntry->key; curve25519_key* key = (curve25519_key*)keyShareEntry->key;
curve25519_key* peerEccKey; curve25519_key* peerX25519Key;
#ifdef HAVE_ECC
if (ssl->peerEccKey != NULL) { if (ssl->peerEccKey != NULL) {
wc_ecc_free(ssl->peerEccKey); wc_ecc_free(ssl->peerEccKey);
ssl->peerEccKey = NULL; ssl->peerEccKey = NULL;
} }
#endif
peerEccKey = (curve25519_key*)XMALLOC(sizeof(curve25519_key), ssl->heap, peerX25519Key = (curve25519_key*)XMALLOC(sizeof(curve25519_key), ssl->heap,
DYNAMIC_TYPE_TLSX); DYNAMIC_TYPE_TLSX);
if (peerEccKey == NULL) { if (peerX25519Key == NULL) {
WOLFSSL_MSG("PeerEccKey Memory error"); WOLFSSL_MSG("PeerEccKey Memory error");
return MEMORY_ERROR; return MEMORY_ERROR;
} }
ret = wc_curve25519_init(peerEccKey); ret = wc_curve25519_init(peerX25519Key);
if (ret != 0) { if (ret != 0) {
XFREE(peerEccKey, ssl->heap, DYNAMIC_TYPE_TLSX); XFREE(peerX25519Key, ssl->heap, DYNAMIC_TYPE_TLSX);
return ret; return ret;
} }
#ifdef WOLFSSL_DEBUG_TLS #ifdef WOLFSSL_DEBUG_TLS
@@ -5726,7 +5728,7 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
/* Point is validated by import function. */ /* Point is validated by import function. */
if (wc_curve25519_import_public_ex(keyShareEntry->ke, keyShareEntry->keLen, if (wc_curve25519_import_public_ex(keyShareEntry->ke, keyShareEntry->keLen,
peerEccKey, peerX25519Key,
EC25519_LITTLE_ENDIAN) != 0) { EC25519_LITTLE_ENDIAN) != 0) {
ret = ECC_PEERKEY_ERROR; ret = ECC_PEERKEY_ERROR;
} }
@@ -5735,14 +5737,13 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
ssl->arrays->preMasterSz = ENCRYPT_LEN; ssl->arrays->preMasterSz = ENCRYPT_LEN;
ssl->ecdhCurveOID = ECC_X25519_OID; ssl->ecdhCurveOID = ECC_X25519_OID;
/* TODO: Switch to support async */ ret = wc_curve25519_shared_secret_ex(key, peerX25519Key,
ret = wc_curve25519_shared_secret_ex(key, peerEccKey,
ssl->arrays->preMasterSecret, ssl->arrays->preMasterSecret,
&ssl->arrays->preMasterSz, &ssl->arrays->preMasterSz,
EC25519_LITTLE_ENDIAN); EC25519_LITTLE_ENDIAN);
} }
wc_curve25519_free(peerEccKey); wc_curve25519_free(peerX25519Key);
XFREE(peerEccKey, ssl->heap, DYNAMIC_TYPE_TLSX); XFREE(peerX25519Key, ssl->heap, DYNAMIC_TYPE_TLSX);
#else #else
(void)ssl; (void)ssl;
(void)keyShareEntry; (void)keyShareEntry;

2
tests/api.c
View File

@@ -18185,7 +18185,7 @@ static int test_tls13_apis(void)
#elif defined(HAVE_CURVE25519) #elif defined(HAVE_CURVE25519)
AssertIntEQ(wolfSSL_UseKeyShare(NULL, WOLFSSL_ECC_X25519), BAD_FUNC_ARG); AssertIntEQ(wolfSSL_UseKeyShare(NULL, WOLFSSL_ECC_X25519), BAD_FUNC_ARG);
AssertIntEQ(wolfSSL_UseKeyShare(serverSsl, WOLFSSL_ECC_X25519), AssertIntEQ(wolfSSL_UseKeyShare(serverSsl, WOLFSSL_ECC_X25519),
SIDE_ERROR); WOLFSSL_SUCCESS);
AssertIntEQ(wolfSSL_UseKeyShare(clientTls12Ssl, WOLFSSL_ECC_X25519), AssertIntEQ(wolfSSL_UseKeyShare(clientTls12Ssl, WOLFSSL_ECC_X25519),
WOLFSSL_SUCCESS); WOLFSSL_SUCCESS);
AssertIntEQ(wolfSSL_UseKeyShare(clientSsl, WOLFSSL_ECC_X25519), AssertIntEQ(wolfSSL_UseKeyShare(clientSsl, WOLFSSL_ECC_X25519),