wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-08-14 09:32:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cross-check cached mldsaOID against decoded signing key

Browse Source
This commit is contained in:
Takashi Kojo
2026-08-07 07:48:34 +09:00
parent 25031722ca
commit 26ec360efb
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x509.c
+10
View File
@@ -12897,6 +12897,16 @@ cleanup:
XFREE(mldsa, x509->heap, DYNAMIC_TYPE_MLDSA);
return WOLFSSL_FATAL_ERROR;
}
/* sigType above came from the cached pkey->mldsaOID; require
* the decoded key to agree so a stale cache cannot emit a
* certificate whose signatureAlgorithm disagrees with the
* actual signature. */
if (oidSum != WOLFSSL_ATOMIC_LOAD(pkey->mldsaOID)) {
WOLFSSL_MSG("ML-DSA key does not match cached pkey OID");
wc_MlDsaKey_Free(mldsa);
XFREE(mldsa, x509->heap, DYNAMIC_TYPE_MLDSA);
return WOLFSSL_FATAL_ERROR;
}
switch (oidSum) {
case ML_DSA_44k:
type = ML_DSA_44_TYPE;
tests/api/test_ossl_x509_pk.c
+13
View File
@@ -425,6 +425,19 @@ int test_wolfSSL_X509_set_pubkey(void)
WOLFSSL_SUCCESS);
wolfSSL_EVP_PKEY_free(pubkey);
pubkey = NULL;
/* A stale/tampered mldsaOID cache must fail the sign
* rather than emit a certificate whose
* signatureAlgorithm disagrees with the actual key. */
if (EXPECT_SUCCESS() && pkey != NULL) {
int realOID = WOLFSSL_ATOMIC_LOAD(pkey->mldsaOID);
int wrongOID = (realOID == ML_DSA_44k) ?
ML_DSA_65k : ML_DSA_44k;
WOLFSSL_ATOMIC_STORE(pkey->mldsaOID, wrongOID);
ExpectIntEQ(wolfSSL_X509_sign(x509, pkey, NULL),
WC_NO_ERR_TRACE(WOLFSSL_FAILURE));
WOLFSSL_ATOMIC_STORE(pkey->mldsaOID, realOID);
}
}
#endif
if (ki + 1 < sizeof(keyFiles) / sizeof(keyFiles[0])) {