pass keysize for rsa/ecc by bytes

Author: night1rider

wolfcrypt/src/asn.c

@@ -8283,7 +8283,8 @@ int wc_RsaPrivateKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
         tmpErr = _RsaPrivateKeyDecode(input, &tmpIdx, tmpKey, NULL, inSz);
         if (tmpErr == 0) {
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                WC_SETKEY_RSA_PRIV, key, tmpKey, 0, NULL, 0, 0);
+                WC_SETKEY_RSA_PRIV, key, tmpKey,
+                wc_RsaEncryptSize(tmpKey), NULL, 0, 0);
         }
 
         wc_FreeRsaKey(tmpKey);
@@ -45143,7 +45144,8 @@ int wc_RsaPublicKeyDecodeRaw(const byte* n, word32 nSz, const byte* e,
         tmpErr = wc_RsaPublicKeyDecodeRaw(n, nSz, e, eSz, tmpKey);
         if (tmpErr == 0) {
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                WC_SETKEY_RSA_PUB, key, tmpKey, 0, NULL, 0, 0);
+                WC_SETKEY_RSA_PUB, key, tmpKey,
+                wc_RsaEncryptSize(tmpKey), NULL, 0, 0);
         }
 
         wc_FreeRsaKey(tmpKey);

wolfcrypt/src/ecc.c

@@ -10698,7 +10698,8 @@ int wc_ecc_import_x963_ex2(const byte* in, word32 inLen, ecc_key* key,
         err = wc_ecc_import_x963_ex2(in, inLen, tmpKey, curve_id, untrusted);
         if (err == MP_OKAY) {
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                WC_SETKEY_ECC_PUB, key, tmpKey, 0, NULL, 0, 0);
+                WC_SETKEY_ECC_PUB, key, tmpKey,
+                wc_ecc_size(tmpKey), NULL, 0, 0);
         }
 
         wc_ecc_free(tmpKey);
@@ -11219,7 +11220,8 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
             tmpKey, curve_id);
         if (tmpErr == 0) {
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                WC_SETKEY_ECC_PRIV, key, tmpKey, 0, NULL, 0, 0);
+                WC_SETKEY_ECC_PRIV, key, tmpKey,
+                wc_ecc_size(tmpKey), NULL, 0, 0);
         }
 
         wc_ecc_free(tmpKey);
@@ -11605,7 +11607,8 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
                 setKeyType = WC_SETKEY_ECC_PUB;
             }
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                setKeyType, key, tmpKey, 0, NULL, 0, 0);
+                setKeyType, key, tmpKey,
+                wc_ecc_size(tmpKey), NULL, 0, 0);
         }
 
         wc_ecc_free(tmpKey);

wolfcrypt/src/rsa.c

@@ -5401,7 +5401,8 @@ int wc_RsaPrivateKeyDecodeRaw(const byte* n, word32 nSz,
             u, uSz, p, pSz, q, qSz, dP, dPSz, dQ, dQSz, tmpKey);
         if (err == MP_OKAY) {
             cbRet = wc_CryptoCb_SetKey(key->devId,
-                WC_SETKEY_RSA_PRIV, key, tmpKey, 0, NULL, 0, 0);
+                WC_SETKEY_RSA_PRIV, key, tmpKey,
+                wc_RsaEncryptSize(tmpKey), NULL, 0, 0);
         }
 
         /* wc_FreeRsaKey does mp_forcezero on private components */