From 3c684886adcfc4fa0a0557e665e17f73b5eb0e04 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 24 Apr 2018 13:39:38 -0700
Subject: [PATCH] Fixes to resolve building `--enable-tls13 --disable-ecc
 --enable-curve25519 --enable-ed25519`.

---
 src/tls.c   | 21 +++++++++++----------
 tests/api.c |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/tls.c b/src/tls.c
index ed36fe93b..b8040ebfb 100755
--- a/src/tls.c
+++ b/src/tls.c
@@ -5701,22 +5701,24 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
 
 #ifdef HAVE_CURVE25519
     curve25519_key* key = (curve25519_key*)keyShareEntry->key;
-    curve25519_key* peerEccKey;
+    curve25519_key* peerX25519Key;
 
+#ifdef HAVE_ECC
     if (ssl->peerEccKey != NULL) {
         wc_ecc_free(ssl->peerEccKey);
         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);
-    if (peerEccKey == NULL) {
+    if (peerX25519Key == NULL) {
         WOLFSSL_MSG("PeerEccKey Memory error");
         return MEMORY_ERROR;
     }
-    ret = wc_curve25519_init(peerEccKey);
+    ret = wc_curve25519_init(peerX25519Key);
     if (ret != 0) {
-        XFREE(peerEccKey, ssl->heap, DYNAMIC_TYPE_TLSX);
+        XFREE(peerX25519Key, ssl->heap, DYNAMIC_TYPE_TLSX);
         return ret;
     }
 #ifdef WOLFSSL_DEBUG_TLS
@@ -5726,7 +5728,7 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
 
     /* Point is validated by import function. */
     if (wc_curve25519_import_public_ex(keyShareEntry->ke, keyShareEntry->keLen,
-                                                  peerEccKey,
+                                                  peerX25519Key,
                                                   EC25519_LITTLE_ENDIAN) != 0) {
         ret = ECC_PEERKEY_ERROR;
     }
@@ -5735,14 +5737,13 @@ static int TLSX_KeyShare_ProcessX25519(WOLFSSL* ssl,
         ssl->arrays->preMasterSz = ENCRYPT_LEN;
         ssl->ecdhCurveOID = ECC_X25519_OID;
 
-        /* TODO: Switch to support async */
-        ret = wc_curve25519_shared_secret_ex(key, peerEccKey,
+        ret = wc_curve25519_shared_secret_ex(key, peerX25519Key,
                                                    ssl->arrays->preMasterSecret,
                                                    &ssl->arrays->preMasterSz,
                                                    EC25519_LITTLE_ENDIAN);
     }
-    wc_curve25519_free(peerEccKey);
-    XFREE(peerEccKey, ssl->heap, DYNAMIC_TYPE_TLSX);
+    wc_curve25519_free(peerX25519Key);
+    XFREE(peerX25519Key, ssl->heap, DYNAMIC_TYPE_TLSX);
 #else
     (void)ssl;
     (void)keyShareEntry;
diff --git a/tests/api.c b/tests/api.c
index 37b1003b9..9d05bb012 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -18185,7 +18185,7 @@ static int test_tls13_apis(void)
 #elif defined(HAVE_CURVE25519)
     AssertIntEQ(wolfSSL_UseKeyShare(NULL, WOLFSSL_ECC_X25519), BAD_FUNC_ARG);
     AssertIntEQ(wolfSSL_UseKeyShare(serverSsl, WOLFSSL_ECC_X25519),
-                SIDE_ERROR);
+                WOLFSSL_SUCCESS);
     AssertIntEQ(wolfSSL_UseKeyShare(clientTls12Ssl, WOLFSSL_ECC_X25519),
                 WOLFSSL_SUCCESS);
     AssertIntEQ(wolfSSL_UseKeyShare(clientSsl, WOLFSSL_ECC_X25519),