Fix custom curve passthrough for import callbacks

Author: night1rider

wolfcrypt/src/ecc.c

@@ -10694,6 +10694,18 @@ int wc_ecc_import_x963_ex2(const byte* in, word32 inLen, ecc_key* key,
             return err;
         }
 
+    #ifdef WOLFSSL_CUSTOM_CURVES
+        /* Copy custom curve params so recursive import uses correct curve */
+        if (key->dp != NULL) {
+            err = wc_ecc_set_custom_curve(tmpKey, key->dp);
+            if (err != 0) {
+                wc_ecc_free(tmpKey);
+                WC_FREE_VAR(tmpKey, key->heap);
+                return err;
+            }
+        }
+    #endif
+
         /* Recursive call imports X9.63 public key into temp via software */
         err = wc_ecc_import_x963_ex2(in, inLen, tmpKey, curve_id, untrusted);
         if (err == MP_OKAY) {
@@ -11214,6 +11226,18 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
             return tmpErr;
         }
 
+    #ifdef WOLFSSL_CUSTOM_CURVES
+        /* Copy custom curve params so recursive import uses correct curve */
+        if (key->dp != NULL) {
+            tmpErr = wc_ecc_set_custom_curve(tmpKey, key->dp);
+            if (tmpErr != 0) {
+                wc_ecc_free(tmpKey);
+                WC_FREE_VAR(tmpKey, key->heap);
+                return tmpErr;
+            }
+        }
+    #endif
+
         /* Recursive call imports key material into temp via software
          * (no callback recursion since tmpKey has INVALID_DEVID) */
         tmpErr = wc_ecc_import_private_key_ex(priv, privSz, pub, pubSz,
@@ -11598,6 +11622,18 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
             return err;
         }
 
+    #ifdef WOLFSSL_CUSTOM_CURVES
+        /* Copy custom curve params so recursive import uses correct curve */
+        if (key->dp != NULL) {
+            err = wc_ecc_set_custom_curve(tmpKey, key->dp);
+            if (err != 0) {
+                wc_ecc_free(tmpKey);
+                WC_FREE_VAR(tmpKey, key->heap);
+                return err;
+            }
+        }
+    #endif
+
         /* Recursive call imports key material into temp via software */
         err = wc_ecc_import_raw_private(tmpKey, qx, qy, d, curve_id, encType);
         if (err == MP_OKAY) {