se050: key_only_id bug fixes

Author: rizlik

wolfcrypt/src/port/nxp/se050_port.c

@@ -2806,6 +2806,13 @@ int se050_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key,
         if (public_key->keyIdSet == 0) {
             byte derBuf[SE050_ECC_DER_MAX];
             word32 derSz;
+#ifdef WOLFSSL_SE050_ONLY_KEY_ID
+            /* The peer's public key is uploaded for this derivation only and
+             * erased afterwards, so it must not occupy SE050 flash. */
+            sss_key_object_mode_t pubKeyMode = kKeyObject_Mode_Transient;
+#else
+            sss_key_object_mode_t pubKeyMode = kKeyObject_Mode_Persistent;
+#endif
 
             ret = wc_EccPublicKeyToDer(public_key, derBuf,
                 (word32)sizeof(derBuf), 1);
@@ -2820,7 +2827,7 @@ int se050_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key,
                 keyId = se050_allocate_key(SE050_ECC_KEY);
                 status = sss_key_object_allocate_handle(&ref_public_key,
                     keyId, kSSS_KeyPart_Public, curveType, keySize,
-                    kKeyObject_Mode_Persistent);
+                    pubKeyMode);
             }
             if (status == kStatus_SSS_Success) {
                 /* Try to delete existing key first, ignore return since will
@@ -2877,8 +2884,18 @@ int se050_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key,
     }
 
     if (status == kStatus_SSS_Success) {
-        public_key->keyId = keyId;
-        public_key->keyIdSet = 1;
+#ifdef WOLFSSL_SE050_ONLY_KEY_ID
+        if (keyCreated) {
+            /* The peer's public key was uploaded for this derivation only. */
+            sss_key_store_erase_key(&host_keystore, &ref_public_key);
+            sss_key_object_free(&ref_public_key);
+        }
+        else
+#endif
+        {
+            public_key->keyId = keyId;
+            public_key->keyIdSet = 1;
+        }
         ret = 0;
     }
     else {
@@ -3458,8 +3475,18 @@ int se050_curve25519_shared_secret(curve25519_key* private_key,
     }
 
     if (status == kStatus_SSS_Success) {
-        public_key->keyId = keyId;
-        public_key->keyIdSet = 1;
+#ifdef WOLFSSL_SE050_ONLY_KEY_ID
+        if (keyCreated) {
+            /* The peer's public key was uploaded for this derivation only.*/
+            sss_key_store_erase_key(&host_keystore, &ref_public_key);
+            sss_key_object_free(&ref_public_key);
+        }
+        else
+#endif
+        {
+            public_key->keyId = keyId;
+            public_key->keyIdSet = 1;
+        }
         ret = 0;
     }
     else {

wolfcrypt/src/rsa.c

@@ -5418,7 +5418,8 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
     int err;
 
 #if !defined(WOLFSSL_CRYPTOCELL) && \
-    (!defined(WOLFSSL_SE050) || defined(WOLFSSL_SE050_NO_RSA)) && \
+    (!defined(WOLFSSL_SE050) || defined(WOLFSSL_SE050_NO_RSA) || \
+     defined(WOLFSSL_SE050_ONLY_KEY_ID)) && \
     !defined(WOLF_CRYPTO_CB_ONLY_RSA) && \
     !defined(WOLFSSL_MICROCHIP_TA100) && \
     !defined(WOLFSSL_SMALL_STACK) && defined(WOLFSSL_CHECK_MEM_ZERO)

wolfcrypt/test/test.c

@@ -30403,9 +30403,9 @@ static wc_test_ret_t rsa_certreq_test(RsaKey* key, RsaKey* keypub,
         * WOLFSSL_CERT_REQ && !WOLFSSL_NO_MALLOC */
 
 #if defined(WOLFSSL_SE050) && defined(WOLFSSL_SE050_ONLY_KEY_ID) && \
-    !defined(WOLFSSL_SE050_NO_RSA) && !defined(WOLFSSL_SE050_NO_RSA_VERIFY) && \
-    !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_RSA_PUBLIC_ONLY) && \
-    !defined(WOLFSSL_RSA_VERIFY_ONLY)
+    defined(WOLFSSL_KEY_GEN) && !defined(WOLFSSL_SE050_NO_RSA) && \
+    !defined(WOLFSSL_SE050_NO_RSA_VERIFY) && !defined(WOLFSSL_NO_MALLOC) && \
+    !defined(WOLFSSL_RSA_PUBLIC_ONLY) && !defined(WOLFSSL_RSA_VERIFY_ONLY)
 
 /* SE050 key ID for the ONLY_KEY_ID RSA test. Must be < SE050_KEYID_START. */
 #define SE050_ONLYKEYID_TEST_RSA_ID 51
@@ -30438,6 +30438,15 @@ static wc_test_ret_t rsa_se050_onlykeyid_test(WC_RNG* rng)
         return WC_TEST_RET_ENC_EC(ret);
     swInit = 1;
 
+    /* An invalid key size must fail cleanly. This drives the early 'goto out'
+     * cleanup in wc_MakeRsaKey(), which under WOLFSSL_CHECK_MEM_ZERO must not
+     * scan the never-initialized stack temporaries. */
+    ret = wc_MakeRsaKey(&swKey, 0, WC_RSA_EXPONENT, rng);
+    if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG)) {
+        ret = WC_TEST_RET_ENC_NC;
+        goto done;
+    }
+
     /* Key generation must produce a software key (keyIdSet == 0). */
     ret = wc_MakeRsaKey(&swKey, 2048, WC_RSA_EXPONENT, rng);
     if (ret != 0) { ret = WC_TEST_RET_ENC_EC(ret); goto done; }
@@ -30878,9 +30887,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t rsa_test(void)
 #endif
 
 #if defined(WOLFSSL_SE050) && defined(WOLFSSL_SE050_ONLY_KEY_ID) && \
-    !defined(WOLFSSL_SE050_NO_RSA) && !defined(WOLFSSL_SE050_NO_RSA_VERIFY) && \
-    !defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_RSA_PUBLIC_ONLY) && \
-    !defined(WOLFSSL_RSA_VERIFY_ONLY)
+    defined(WOLFSSL_KEY_GEN) && !defined(WOLFSSL_SE050_NO_RSA) && \
+    !defined(WOLFSSL_SE050_NO_RSA_VERIFY) && !defined(WOLFSSL_NO_MALLOC) && \
+    !defined(WOLFSSL_RSA_PUBLIC_ONLY) && !defined(WOLFSSL_RSA_VERIFY_ONLY)
     ret = rsa_se050_onlykeyid_test(&rng);
     if (ret != 0) {
         printf("rsa_se050_onlykeyid_test failed!\n");
@@ -43985,6 +43994,20 @@ static wc_test_ret_t ecc_se050_onlykeyid_test(WC_RNG* rng)
     if (ret != 0) { ret = WC_TEST_RET_ENC_EC(ret); goto done; }
     if (verify != 1) { ret = WC_TEST_RET_ENC_NC; goto done; }
 
+    /* A corrupted signature must be rejected on the hardware route. The SE050
+     * port reports a failed hardware verify as WC_HW_E with res still 0 (the
+     * SSS API does not distinguish a bad signature from an operation failure),
+     * matching the always-offload SE050 build's error mapping. */
+    sigHw[10] ^= 0x01;
+    verify = 1;
+    ret = wc_ecc_verify_hash(sigHw, sigHwSz, hash, (word32)sizeof(hash),
+                             &verify, &hwKey);
+    sigHw[10] ^= 0x01;
+    if (ret != WC_NO_ERR_TRACE(WC_HW_E) || verify != 0) {
+        ret = WC_TEST_RET_ENC_NC; goto done;
+    }
+    ret = 0;
+
 #if defined(HAVE_ECC_DHE) && !defined(WOLFSSL_SE050_NO_ECDHE)
     {
         /* ECDH with the software key must match ECDH with the same key after it
@@ -44012,6 +44035,12 @@ static wc_test_ret_t ecc_se050_onlykeyid_test(WC_RNG* rng)
         ret = wc_ecc_shared_secret(&hwKey, &peer, secretHw, &secretHwSz);
         if (ret != 0) { ret = WC_TEST_RET_ENC_EC(ret); goto ecdh_done; }
 
+        /* The peer was and must remain a software key (keyIdSet == 0) */
+        if (peer.keyIdSet != 0) {
+            ret = WC_TEST_RET_ENC_NC;
+            goto ecdh_done;
+        }
+
         if (secretSwSz != secretHwSz ||
                 XMEMCMP(secretSw, secretHw, secretSwSz) != 0) {
             ret = WC_TEST_RET_ENC_NC;