Fix to prevent static ephemeral memory leak if WC_PK_TYPE_NONE is used for auto-detect. Add DER PK auto detect support. Add sniffer ssl_SetWatchKey_buffer support for static ephemeral.

src/sniffer.c

@@ -1684,7 +1684,7 @@ static int SetNamedPrivateKey(const char* name, const char* address, int port,
             /* auto detect key type with WC_PK_TYPE_NONE */
             /* keySz == 0 mean load file */
             ret = wolfSSL_CTX_set_ephemeral_key(sniffer->ctx, WC_PK_TYPE_NONE, 
-                keyFile, 0, type);
+                keyFile, keySz, type);
             if (ret == 0)
                 ret = WOLFSSL_SUCCESS;
         }
@@ -5716,8 +5716,21 @@ int ssl_SetWatchKey_buffer(void* vSniffer, const byte* key, word32 keySz,
     keyType = (keyType == FILETYPE_PEM) ? WOLFSSL_FILETYPE_PEM :
                                           WOLFSSL_FILETYPE_ASN1;
 
+#ifdef WOLFSSL_STATIC_EPHEMERAL
+    /* try setting static ephemeral first */
+    /* auto detect key type with WC_PK_TYPE_NONE */
+    ret = wolfSSL_set_ephemeral_key(sniffer->sslServer, 
+        WC_PK_TYPE_NONE, (const char*)key, keySz,
+            WOLFSSL_FILETYPE_ASN1);
+    if (ret == 0) {
+        ret = WOLFSSL_SUCCESS;
+    }
+    else
+#endif
+    {
         ret = wolfSSL_use_PrivateKey_buffer(sniffer->sslServer,
             key, keySz, keyType);
+    }
     if (ret != WOLFSSL_SUCCESS) {
         SetError(KEY_FILE_STR, error, sniffer, FATAL_ERROR_STATE);
         return -1;

src/ssl.c

@@ -53027,24 +53027,9 @@ static int SetStaticEphemeralKey(StaticKeyExchangeInfo_t* staticKE, int keyAlgo,
 
     WOLFSSL_ENTER("SetStaticEphemeralKey");
 
-    /* if key is already set free it */
+    /* if just free'ing key then skip loading */
-#ifndef NO_DH
+    if (key != NULL && keySz > 0) {
-    if (keyAlgo == WC_PK_TYPE_DH && staticKE->dhKey && 
+    #ifndef NO_FILESYSTEM
-            (ctx == NULL || staticKE->dhKey != ctx->staticKE.dhKey))
-        FreeDer(&staticKE->dhKey);
-#endif
-#ifdef HAVE_ECC
-    if (keyAlgo == WC_PK_TYPE_ECDH && staticKE->ecKey && 
-            (ctx == NULL || staticKE->ecKey != ctx->staticKE.ecKey))
-        FreeDer(&staticKE->ecKey);
-#endif
-
-    /* check if just free'ing key */
-    if (key == NULL && keySz == 0) {
-        return 0;
-    }
-
-#ifndef NO_FILESYSTEM
         /* load file from filesystem */
         if (key && keySz == 0) {
             size_t keyBufSz = 0;
@@ -53056,7 +53041,7 @@ static int SetStaticEphemeralKey(StaticKeyExchangeInfo_t* staticKE, int keyAlgo,
             keySz = (unsigned int)keyBufSz;
         }
         else
-#endif
+    #endif
         {
             /* use as key buffer directly */
             keyBuf = (byte*)key;
@@ -53068,7 +53053,7 @@ static int SetStaticEphemeralKey(StaticKeyExchangeInfo_t* staticKE, int keyAlgo,
             ret = PemToDer(keyBuf, keySz, PRIVATEKEY_TYPE, &der, 
                 heap, NULL, &keyFormat);
             /* auto detect key type */
-        if (ret == 0 && keyAlgo == 0) {
+            if (ret == 0 && keyAlgo == WC_PK_TYPE_NONE) {
                 if (keyFormat == ECDSAk)
                     keyAlgo = WC_PK_TYPE_ECDH;
                 else
@@ -53079,11 +53064,54 @@ static int SetStaticEphemeralKey(StaticKeyExchangeInfo_t* staticKE, int keyAlgo,
         #endif
         }
         else {
+            /* Detect PK type (if required) */
+        #ifdef HAVE_ECC
+            if (keyAlgo == WC_PK_TYPE_NONE) {
+                word32 idx = 0;
+                ecc_key eccKey;
+                ret = wc_ecc_init_ex(&eccKey, heap, INVALID_DEVID);
+                if (ret == 0) {
+                    ret = wc_EccPrivateKeyDecode(keyBuf, &idx, &eccKey, keySz);
+                    if (ret == 0)
+                        keyAlgo = WC_PK_TYPE_ECDH;
+                    wc_ecc_free(&eccKey);
+                }
+            }
+        #endif
+        #if !defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)
+            if (keyAlgo == WC_PK_TYPE_NONE) {
+                word32 idx = 0;
+                DhKey dhKey;
+                ret = wc_InitDhKey_ex(&dhKey, heap, INVALID_DEVID);
+                if (ret == 0) {
+                    ret = wc_DhKeyDecode(keyBuf, &idx, &dhKey, keySz);
+                    if (ret == 0)
+                        keyAlgo = WC_PK_TYPE_DH;
+                    wc_FreeDhKey(&dhKey);
+                }
+            }
+        #endif
+
+            if (keyAlgo != WC_PK_TYPE_NONE) {
                 ret = AllocDer(&der, keySz, PRIVATEKEY_TYPE, heap);
                 if (ret == 0) {
                     XMEMCPY(der->buffer, keyBuf, keySz);
                 }
             }
+        }
+    }
+
+    /* if key is already set free it */
+#ifndef NO_DH
+    if (keyAlgo == WC_PK_TYPE_DH && staticKE->dhKey && 
+            (ctx == NULL || staticKE->dhKey != ctx->staticKE.dhKey))
+        FreeDer(&staticKE->dhKey);
+#endif
+#ifdef HAVE_ECC
+    if (keyAlgo == WC_PK_TYPE_ECDH && staticKE->ecKey && 
+            (ctx == NULL || staticKE->ecKey != ctx->staticKE.ecKey))
+        FreeDer(&staticKE->ecKey);
+#endif
 
     switch (keyAlgo) {
     #ifndef NO_DH