Merge pull request #360 from padelsbach/test-fixes-ed25519

Fixes in ed25519 tests, add prints in timeout tests

Author: bigbrett

test-refactor/client-server/wh_test_crypto.c

@@ -168,13 +168,20 @@ int whTest_CryptoEcc256(whClientContext* ctx)
     int              ret    = 0;
     WC_RNG           rng[1];
     ecc_key          key[1];
-    uint8_t          hash[32]              = {0};
+    /* Non-zero digest: wolfCrypt rejects all-zero hashes with ECC_BAD_ARG_E
+     * unless WC_ALLOW_ECC_ZERO_HASH is defined. */
+    uint8_t          hash[32];
     uint8_t          sig[ECC_MAX_SIG_SIZE] = {0};
     word32           sigLen                = sizeof(sig);
     int              verify                = 0;
+    word32           i;
 
     (void)ctx;
 
+    for (i = 0; i < sizeof(hash); i++) {
+        hash[i] = (uint8_t)(i + 1);
+    }
+
     /* Minimal P-256 sign/verify round-trip routed through the server via
      * WH_DEV_ID. Key size 32 selects SECP256R1 as wolfCrypt's default. */
     ret = wc_InitRng_ex(rng, NULL, devId);

test/wh_test_crypto.c

@@ -1159,14 +1159,21 @@ static int whTest_CryptoEccExportPublicDma(whClientContext* ctx, int devId,
     int     ret               = 0;
     whKeyId keyId             = WH_KEYID_ERASED;
     ecc_key pubKey[1]         = {0};
-    uint8_t hash[TEST_ECC_KEYSIZE] = {0};
+    /* Non-zero digest: wolfCrypt rejects all-zero hashes with ECC_BAD_ARG_E
+     * unless WC_ALLOW_ECC_ZERO_HASH is defined. */
+    uint8_t hash[TEST_ECC_KEYSIZE];
     uint8_t sig[ECC_MAX_SIG_SIZE]  = {0};
     word32  sigLen            = sizeof(sig);
     int     verified          = 0;
     byte    derBuf[ECC_BUFSIZE];
     uint16_t derSz            = sizeof(derBuf);
+    word32   i;
     (void)devId;
 
+    for (i = 0; i < sizeof(hash); i++) {
+        hash[i] = (uint8_t)(i + 1);
+    }
+
     ret = wh_Client_EccMakeCacheKey(
         ctx, TEST_ECC_KEYSIZE, TEST_ECC_CURVE_ID, &keyId,
         WH_NVM_FLAGS_USAGE_SIGN | WH_NVM_FLAGS_USAGE_VERIFY |
@@ -2461,13 +2468,18 @@ static int whTest_Ed25519ImportToServer(whClientContext* ctx, int devId,
         }
     }
 
+    /* Write each out-keyId immediately after its import succeeds so the
+     * caller can evict it if a later step fails. */
     if (ret == 0) {
         ret = wh_Client_Ed25519ImportKey(
             ctx, key, &signKeyId, WH_NVM_FLAGS_USAGE_SIGN, labelLen, label);
         if (ret != 0) {
             WH_ERROR_PRINT("Failed to import Ed25519 key to server: %d\n", ret);
         }
         else {
+            if (outSignKeyId != NULL) {
+                *outSignKeyId = signKeyId;
+            }
             /* remove key material from local key structure */
             wc_ed25519_free(key);
             ret = wc_ed25519_init_ex(key, NULL, devId);
@@ -2490,6 +2502,9 @@ static int whTest_Ed25519ImportToServer(whClientContext* ctx, int devId,
                 "Failed to import Ed25519 public key to server: %d\n", ret);
         }
         else {
+            if (outVerifyKeyId != NULL) {
+                *outVerifyKeyId = verifyKeyId;
+            }
             /* remove key material from local key structure */
             wc_ed25519_free(pubKey);
             ret = wc_ed25519_init_ex(pubKey, NULL, devId);
@@ -2503,15 +2518,6 @@ static int whTest_Ed25519ImportToServer(whClientContext* ctx, int devId,
         }
     }
 
-    if (ret == 0) {
-        if (outSignKeyId != NULL) {
-            *outSignKeyId = signKeyId;
-        }
-        if (outVerifyKeyId != NULL) {
-            *outVerifyKeyId = verifyKeyId;
-        }
-    }
-
     return ret;
 }
 
@@ -2582,18 +2588,25 @@ static int whTest_CryptoEd25519Inline(whClientContext* ctx, int devId,
     }
 
     if (ret == 0) {
-        /* Corrupt signature to ensure verification fails */
+        /* Corrupt signature to ensure verification fails. wolfCrypt may
+         * signal rejection either as ret==0 with verified==0, or as
+         * ret==SIG_VERIFY_E (path-dependent inside wolfCrypt). Anything
+         * else is a real error. */
         sig[0] ^= 0xFF;
         verified = 0;
         ret = wc_ed25519_verify_msg(sig, sigSz, msg, msgSz, &verified, pubKey);
-        if (ret == 0 && verified == 1) {
+        if (verified != 0) {
             WH_ERROR_PRINT(
                 "Modified Ed25519 signature unexpectedly verified\n");
             ret = -1;
         }
-        else {
+        else if (ret == 0 || ret == SIG_VERIFY_E) {
             ret = 0;
         }
+        else {
+            WH_ERROR_PRINT(
+                "wc_ed25519_verify_msg of tampered sig errored: %d\n", ret);
+        }
     }
 
     if (ret == 0) {
@@ -2677,19 +2690,24 @@ static int whTest_CryptoEd25519ServerKey(whClientContext* ctx, int devId,
     }
 
     if (ret == 0) {
+        /* Same shape as the inline tampered-sig case above. */
         sig[0] ^= 0xAA;
         verified = 0;
         ret      = wh_Client_Ed25519Verify(ctx, pubKey, sig, sigSz, msg,
                                            (uint32_t)sizeof(msg), (uint8_t)Ed25519,
                                            NULL, 0, &verified);
-        if (ret == 0 && verified == 1) {
+        if (verified != 0) {
             WH_ERROR_PRINT("Modified server Ed25519 signature unexpectedly "
                            "verified\n");
             ret = -1;
         }
-        else {
+        else if (ret == 0 || ret == SIG_VERIFY_E) {
             ret = 0;
         }
+        else {
+            WH_ERROR_PRINT(
+                "Server Ed25519 verify of tampered sig errored: %d\n", ret);
+        }
     }
 
     if (!WH_KEYID_ISERASED(signKeyId)) {

test/wh_test_timeout.c

@@ -208,6 +208,7 @@ static int whTest_TimeoutAesCbc(void)
     wh_Nvm_Cleanup(nvm);
     wolfCrypt_Cleanup();
 
+    WH_TEST_PRINT("Timeout AES CBC SUCCESS\n");
     return WH_ERROR_OK;
 }
 
@@ -371,6 +372,7 @@ static int whTest_TimeoutAesCbcOverride(void)
     wh_Nvm_Cleanup(nvm);
     wolfCrypt_Cleanup();
 
+    WH_TEST_PRINT("Timeout AES CBC override SUCCESS\n");
     return WH_ERROR_OK;
 }
 
@@ -402,6 +404,7 @@ static int whTest_TimeoutApi(void)
     WH_TEST_ASSERT_RETURN(wh_Timeout_Expired(0) == WH_ERROR_BADARGS);
     WH_TEST_ASSERT_RETURN(wh_Timeout_Cleanup(0) == WH_ERROR_BADARGS);
 
+    WH_TEST_PRINT("Timeout API SUCCESS\n");
     return WH_ERROR_OK;
 }
 
@@ -423,6 +426,7 @@ static int whTest_TimeoutResponse(whClientContext* client)
     } while (rc == WH_ERROR_NOTREADY);
     WH_TEST_ASSERT_RETURN(rc == WH_ERROR_TIMEOUT);
 
+    WH_TEST_PRINT("Timeout response SUCCESS\n");
     return WH_ERROR_OK;
 }
 
@@ -446,6 +450,7 @@ int whTest_TimeoutClientConfig(whClientConfig* config)
     WH_TEST_RETURN_ON_FAIL(whTest_TimeoutAesCbcOverride());
 #endif
 
+    WH_TEST_PRINT("Timeout client config SUCCESS\n");
     return WH_ERROR_OK;
 }
 
@@ -483,7 +488,9 @@ int whTest_TimeoutPosix(void)
                       .comm = ccConf,
     }};
 
-    return whTest_TimeoutClientConfig(cConf);
+    WH_TEST_RETURN_ON_FAIL(whTest_TimeoutClientConfig(cConf));
+    WH_TEST_PRINT("Timeout (POSIX) SUCCESS\n");
+    return WH_ERROR_OK;
 }
 #endif /* WOLFHSM_CFG_TEST_POSIX */