Fix for not HAVE_ECC

Author: embhorn

src/internal.c

@@ -2309,7 +2309,11 @@ static INLINE int wcPrimeForId(byte id)
             return ECC_SECP521R1;
 #endif
         default:
+#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
             return ECC_CURVE_INVALID;
+#else
+            return -1;
+#endif
     }
 }
 
@@ -6428,9 +6432,11 @@ static const char cannedKeyAlgoClientNames[] =
 #endif
 
 static const char cannedKeyAlgoRsaNames[] = "ssh-rsa";
+#if !defined(WOLFSSH_NO_ECDSA)
 static const char cannedKeyAlgoEcc256Names[] = "ecdsa-sha2-nistp256";
 static const char cannedKeyAlgoEcc384Names[] = "ecdsa-sha2-nistp384";
 static const char cannedKeyAlgoEcc521Names[] = "ecdsa-sha2-nistp521";
+#endif
 
 static const char cannedKexAlgoNames[] =
 #if !defined(WOLFSSH_NO_ECDH_SHA2_NISTP521)
@@ -6470,12 +6476,14 @@ static const word32 cannedMacAlgoNamesSz = sizeof(cannedMacAlgoNames) - 2;
 static const word32 cannedKeyAlgoClientNamesSz =
                                            sizeof(cannedKeyAlgoClientNames) - 2;
 static const word32 cannedKeyAlgoRsaNamesSz = sizeof(cannedKeyAlgoRsaNames) - 1;
+#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
 static const word32 cannedKeyAlgoEcc256NamesSz =
                                            sizeof(cannedKeyAlgoEcc256Names) - 1;
 static const word32 cannedKeyAlgoEcc384NamesSz =
                                            sizeof(cannedKeyAlgoEcc384Names) - 1;
 static const word32 cannedKeyAlgoEcc521NamesSz =
                                            sizeof(cannedKeyAlgoEcc521Names) - 1;
+#endif
 static const word32 cannedKexAlgoNamesSz = sizeof(cannedKexAlgoNames) - 2;
 static const word32 cannedNoneNamesSz = sizeof(cannedNoneNames) - 1;
 
@@ -6509,6 +6517,7 @@ int SendKexInit(WOLFSSH* ssh)
     if (ret == WS_SUCCESS) {
         if (ssh->ctx->side == WOLFSSH_ENDPOINT_SERVER) {
             switch (ssh->ctx->useEcc) {
+#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
                 case ECC_SECP256R1:
                     cannedKeyAlgoNames = cannedKeyAlgoEcc256Names;
                     cannedKeyAlgoNamesSz = cannedKeyAlgoEcc256NamesSz;
@@ -6521,6 +6530,7 @@ int SendKexInit(WOLFSSH* ssh)
                     cannedKeyAlgoNames = cannedKeyAlgoEcc521Names;
                     cannedKeyAlgoNamesSz = cannedKeyAlgoEcc521NamesSz;
                     break;
+#endif
                 default:
                     cannedKeyAlgoNames = cannedKeyAlgoRsaNames;
                     cannedKeyAlgoNamesSz = cannedKeyAlgoRsaNamesSz;
@@ -7053,6 +7063,7 @@ int SendKexDhReply(WOLFSSH* ssh)
 #endif /* ! WOLFSSH_NO_DH */
             }
             else {
+#if !defined(WOLFSSH_NO_ECDH)
                 ecc_key pubKey;
                 ecc_key privKey;
                 int primeId;
@@ -7088,6 +7099,7 @@ int SendKexDhReply(WOLFSSH* ssh)
                                                ssh->k, &ssh->kSz);
                 wc_ecc_free(&privKey);
                 wc_ecc_free(&pubKey);
+#endif /* !defined(WOLFSSH_NO_ECDH) */
             }
         }
 
@@ -7651,6 +7663,7 @@ int SendKexDhInit(WOLFSSH* ssh)
 #endif
         }
         else {
+#if !defined(WOLFSSH_NO_ECDH)
             ecc_key* privKey = &ssh->handshake->privKey.ecc;
             int primeId = wcPrimeForId(ssh->handshake->kexId);
 
@@ -7670,6 +7683,7 @@ int SendKexDhInit(WOLFSSH* ssh)
                                      privKey, primeId);
             if (ret == 0)
                 ret = wc_ecc_export_x963(privKey, e, &eSz);
+#endif /* !defined(WOLFSSH_NO_ECDH) */
         }
 
         if (ret == 0)

tests/api.c

@@ -471,7 +471,7 @@ static const char serverKeyEccDer[] =
     "45747a834c61f33fad26cf22cda9a3bca561b47ce662d4c2f755439a31fb8011"
     "20b5124b24f578d7fd22ef4635f005586b5f63c8da1bc4f569";
 static const int serverKeyEccCurveId = ECC_SECP256R1;
-#elif defined(WOLFSSH_NO_ECDSA_SHA2_NISTP384)
+#elif !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP384)
 static const char serverKeyEccDer[] =
     "3081a402010104303eadd2bbbf05a7be3a3f7c28151289de5bb3644d7011761d"
     "b56f2a0362fba64f98e64ff986dc4fb8efdb2d6b8da57142a00706052b810400"
@@ -480,7 +480,7 @@ static const char serverKeyEccDer[] =
     "b4c6a4cf5e97bd7e51e975e3e9217261506eb9cf3c493d3eb88d467b5f27ebab"
     "2161c00066febd";
 static const int serverKeyEccCurveId = ECC_SECP384R1;
-#elif defined(WOLFSSH_NO_ECDSA_SHA2_NISTP521)
+#elif !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP521)
 static const char serverKeyEccDer[] =
     "3081dc0201010442004ca4d86428d9400e7b2df3912eb996c195895043af92e8"
     "6de70ae4df46f22a291a6bb2748aae82580df6c39f49b3ed82f1789ece1b657d"

wolfssh/internal.h

@@ -463,7 +463,9 @@ typedef struct HandshakeInfo {
 #ifndef WOLFSSH_NO_DH
         DhKey dh;
 #endif
+#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECDH)
         ecc_key ecc;
+#endif
     } privKey;
 } HandshakeInfo;