Skip to content

Commit 5e7ae4e

Browse files
aidangarskeaidangarske
committed
Move MAX_* def and remove unesesary gateing
1 parent f5fa72e commit 5e7ae4e

5 files changed

Lines changed: 15 additions & 33 deletions

File tree

‎src/tpm2_packet.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ void TPM2_Packet_AppendSignature(TPM2_Packet* packet, TPMT_SIGNATURE* sig)
812812
TPM2_Packet_AppendBytes(packet, sig->signature.hmac.digest.H, digestSz);
813813
break;
814814
#ifdef WOLFTPM_V185
815-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
816815
case TPM_ALG_ML_DSA_44:
817816
case TPM_ALG_ML_DSA_65:
818817
case TPM_ALG_ML_DSA_87:
@@ -821,7 +820,6 @@ void TPM2_Packet_AppendSignature(TPM2_Packet* packet, TPMT_SIGNATURE* sig)
821820
TPM2_Packet_AppendBytes(packet, sig->signature.mldsa.signature.buffer,
822821
sig->signature.mldsa.signature.size);
823822
break;
824-
#endif /* HAVE_DILITHIUM */
825823
#endif /* WOLFTPM_V185 */
826824
default:
827825
break;
@@ -860,7 +858,6 @@ void TPM2_Packet_ParseSignature(TPM2_Packet* packet, TPMT_SIGNATURE* sig)
860858
TPM2_Packet_ParseBytes(packet, sig->signature.hmac.digest.H, digestSz);
861859
break;
862860
#ifdef WOLFTPM_V185
863-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
864861
case TPM_ALG_ML_DSA_44:
865862
case TPM_ALG_ML_DSA_65:
866863
case TPM_ALG_ML_DSA_87:
@@ -869,7 +866,6 @@ void TPM2_Packet_ParseSignature(TPM2_Packet* packet, TPMT_SIGNATURE* sig)
869866
TPM2_Packet_ParseBytes(packet, sig->signature.mldsa.signature.buffer,
870867
sig->signature.mldsa.signature.size);
871868
break;
872-
#endif /* HAVE_DILITHIUM */
873869
#endif /* WOLFTPM_V185 */
874870
default:
875871
break;

‎src/tpm2_wrap.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4423,7 +4423,6 @@ int wolfTPM2_SignSequenceComplete(WOLFTPM2_DEV* dev,
44234423
}
44244424
}
44254425
#ifdef WOLFTPM_V185
4426-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
44274426
else if (signSeqCompleteOut.signature.sigAlg == TPM_ALG_ML_DSA_44 ||
44284427
signSeqCompleteOut.signature.sigAlg == TPM_ALG_ML_DSA_65 ||
44294428
signSeqCompleteOut.signature.sigAlg == TPM_ALG_ML_DSA_87) {
@@ -4437,7 +4436,6 @@ int wolfTPM2_SignSequenceComplete(WOLFTPM2_DEV* dev,
44374436
rc = BUFFER_E;
44384437
}
44394438
}
4440-
#endif /* HAVE_DILITHIUM */
44414439
#endif /* WOLFTPM_V185 */
44424440
else {
44434441
/* Unknown algorithm */
@@ -4564,7 +4562,6 @@ int wolfTPM2_VerifySequenceComplete(WOLFTPM2_DEV* dev,
45644562
XMEMCPY(signature.signature.rsassa.sig.buffer, sig, sigSz);
45654563
}
45664564
#ifdef WOLFTPM_V185
4567-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
45684565
else {
45694566
/* For ML-DSA try to detect from signature */
45704567
TPMI_ALG_SIG_SCHEME scheme = TPM_ALG_NULL;
@@ -4615,7 +4612,6 @@ int wolfTPM2_VerifySequenceComplete(WOLFTPM2_DEV* dev,
46154612
return BAD_FUNC_ARG;
46164613
}
46174614
}
4618-
#endif /* HAVE_DILITHIUM */
46194615
#else
46204616
else {
46214617
/* For PQ algorithms or unknown types, return error */
@@ -4694,7 +4690,6 @@ int wolfTPM2_SignDigest(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
46944690
}
46954691
}
46964692
#ifdef WOLFTPM_V185
4697-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
46984693
else if (signDigestOut.signature.sigAlg == TPM_ALG_ML_DSA_44 ||
46994694
signDigestOut.signature.sigAlg == TPM_ALG_ML_DSA_65 ||
47004695
signDigestOut.signature.sigAlg == TPM_ALG_ML_DSA_87) {
@@ -4708,7 +4703,6 @@ int wolfTPM2_SignDigest(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
47084703
rc = BUFFER_E;
47094704
}
47104705
}
4711-
#endif /* HAVE_DILITHIUM */
47124706
#endif /* WOLFTPM_V185 */
47134707
else {
47144708
/* Unknown algorithm */
@@ -4781,7 +4775,6 @@ int wolfTPM2_VerifyDigestSignature(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
47814775
XMEMCPY(signature.signature.rsassa.sig.buffer, sig, sigSz);
47824776
}
47834777
#ifdef WOLFTPM_V185
4784-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
47854778
else {
47864779
/* For ML-DSA and other PQ algorithms, try to detect from signature */
47874780
/* ML-DSA signatures are large: ML-DSA-44: ~2420 bytes, ML-DSA-65: ~3309 bytes, ML-DSA-87: ~4627 bytes */
@@ -4834,7 +4827,6 @@ int wolfTPM2_VerifyDigestSignature(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
48344827
return BAD_FUNC_ARG;
48354828
}
48364829
}
4837-
#endif /* HAVE_DILITHIUM */
48384830
#else
48394831
else {
48404832
/* For PQ algorithms or unknown types, return error */

‎tests/unit_tests.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ static void test_wolfTPM2_EccSignVerifyDig(WOLFTPM2_DEV* dev,
428428
word32 rLen, sLen;
429429
ecc_key wolfKey;
430430
int curveSize = TPM2_GetCurveSize(curve);
431+
int tpmDevId = -2; /* INVALID_DEVID */
431432
#ifdef WOLF_CRYPTO_CB
432-
int tpmDevId = INVALID_DEVID;
433433
TpmCryptoDevCtx tpmCtx;
434434

435435
XMEMSET(&tpmCtx, 0, sizeof(tpmCtx));
@@ -553,9 +553,11 @@ static void test_wolfTPM2_EccSignVerifyDig(WOLFTPM2_DEV* dev,
553553
(flags & FLAGS_USE_CRYPTO_CB) ? "Crypto CB" : "",
554554
rc == 0 ? "Passed" : "Failed");
555555

556+
#ifdef WOLFTPM_CRYPTOCB
556557
if (flags & FLAGS_USE_CRYPTO_CB) {
557558
wolfTPM2_ClearCryptoDevCb(dev, tpmDevId);
558559
}
560+
#endif
559561
}
560562

561563
static void test_wolfTPM2_EccSignVerify_All(WOLFTPM2_DEV* dev,
@@ -884,7 +886,6 @@ static void test_wolfTPM2_KeyBlob(TPM_ALG_ID alg)
884886
}
885887

886888
#ifdef WOLFTPM_V185
887-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
888889
/* Post-Quantum Cryptography (PQC) Unit Tests - TPM 2.0 v185 */
889890

890891
/* Test ML-DSA Sign Sequence (Start, Update, Complete) */
@@ -1010,7 +1011,6 @@ static void test_wolfTPM2_MLDSA_VerifyDigestSignature(WOLFTPM2_DEV* dev,
10101011
printf("Test TPM Wrapper:\tML-DSA Verify Digest:\t%s\n",
10111012
rc == 0 ? "Passed" : "Failed");
10121013
}
1013-
#endif /* HAVE_DILITHIUM */
10141014

10151015
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && \
10161016
(defined(WOLFSSL_HAVE_MLKEM) || defined(WOLFSSL_KYBER512) || \
@@ -1114,13 +1114,11 @@ static void test_wolfTPM2_PQC(void)
11141114
int rc;
11151115
WOLFTPM2_DEV dev;
11161116
WOLFTPM2_KEY storageKey;
1117-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
11181117
WOLFTPM2_KEY mldsaKey;
11191118
byte sig[5000];
11201119
int sigSz = (int)sizeof(sig);
11211120
byte digest[32];
11221121
int digestSz = 32;
1123-
#endif
11241122
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && \
11251123
(defined(WOLFSSL_HAVE_MLKEM) || defined(WOLFSSL_KYBER512) || \
11261124
defined(WOLFSSL_KYBER768) || defined(WOLFSSL_KYBER1024))
@@ -1136,7 +1134,6 @@ static void test_wolfTPM2_PQC(void)
11361134
(byte*)gStorageKeyAuth, sizeof(gStorageKeyAuth)-1);
11371135
AssertIntEQ(rc, 0);
11381136

1139-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
11401137
/* Note: ML-DSA key creation would need proper TPM 2.0 v185 support */
11411138
/* For now, tests will gracefully skip if not supported */
11421139
printf("Testing ML-DSA functions (will skip if not supported by TPM)...\n");
@@ -1166,7 +1163,6 @@ static void test_wolfTPM2_PQC(void)
11661163
test_wolfTPM2_MLDSA_VerifyDigestSignature(&dev, &mldsaKey,
11671164
digest, digestSz, sig, sigSz);
11681165
}
1169-
#endif
11701166

11711167
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && \
11721168
(defined(WOLFSSL_HAVE_MLKEM) || defined(WOLFSSL_KYBER512) || \

‎wolftpm/tpm2.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -901,25 +901,16 @@ typedef struct TPM2B_IV {
901901

902902
#ifdef WOLFTPM_V185
903903
/* Post-Quantum Cryptography (PQC) Types */
904-
#ifndef MAX_SIGNATURE_CTX_SIZE
905-
#define MAX_SIGNATURE_CTX_SIZE 1024
906-
#endif
907904
typedef struct TPM2B_SIGNATURE_CTX {
908905
UINT16 size;
909906
BYTE buffer[MAX_SIGNATURE_CTX_SIZE];
910907
} TPM2B_SIGNATURE_CTX;
911908

912-
#ifndef MAX_KEM_CIPHERTEXT_SIZE
913-
#define MAX_KEM_CIPHERTEXT_SIZE 2048
914-
#endif
915909
typedef struct TPM2B_KEM_CIPHERTEXT {
916910
UINT16 size;
917911
BYTE buffer[MAX_KEM_CIPHERTEXT_SIZE];
918912
} TPM2B_KEM_CIPHERTEXT;
919913

920-
#ifndef MAX_SHARED_SECRET_SIZE
921-
#define MAX_SHARED_SECRET_SIZE 64
922-
#endif
923914
typedef struct TPM2B_SHARED_SECRET {
924915
UINT16 size;
925916
BYTE buffer[MAX_SHARED_SECRET_SIZE];
@@ -1418,14 +1409,11 @@ typedef TPMS_SIGNATURE_ECC TPMS_SIGNATURE_ECDSA;
14181409
typedef TPMS_SIGNATURE_ECC TPMS_SIGNATURE_ECDAA;
14191410

14201411
#ifdef WOLFTPM_V185
1421-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
14221412
/* ML-DSA (Dilithium) Signature Structure */
1423-
/* Only defined if wolfCrypt supports Dilithium (HAVE_DILITHIUM from settings.h) */
14241413
typedef struct TPMS_SIGNATURE_ML_DSA {
14251414
TPMI_ALG_HASH hash;
14261415
TPM2B_MAX_BUFFER signature; /* ML-DSA signature is variable length */
14271416
} TPMS_SIGNATURE_ML_DSA;
1428-
#endif /* HAVE_DILITHIUM */
14291417
#endif /* WOLFTPM_V185 */
14301418

14311419
typedef union TPMU_SIGNATURE {
@@ -1436,9 +1424,7 @@ typedef union TPMU_SIGNATURE {
14361424
TPMT_HA hmac;
14371425
TPMS_SCHEME_HASH any;
14381426
#ifdef WOLFTPM_V185
1439-
#if !defined(WOLFTPM2_NO_WOLFCRYPT) && defined(HAVE_DILITHIUM)
14401427
TPMS_SIGNATURE_ML_DSA mldsa;
1441-
#endif /* HAVE_DILITHIUM */
14421428
#endif /* WOLFTPM_V185 */
14431429
} TPMU_SIGNATURE;
14441430

‎wolftpm/tpm2_types.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,18 @@ typedef int64_t INT64;
689689
#ifndef MAX_CAP_HANDLES
690690
#define MAX_CAP_HANDLES (MAX_CAP_DATA / sizeof(TPM_HANDLE))
691691
#endif
692+
#ifdef WOLFTPM_V185
693+
/* Post-Quantum Cryptography (PQC) Size Definitions */
694+
#ifndef MAX_SIGNATURE_CTX_SIZE
695+
#define MAX_SIGNATURE_CTX_SIZE 1024
696+
#endif
697+
#ifndef MAX_KEM_CIPHERTEXT_SIZE
698+
#define MAX_KEM_CIPHERTEXT_SIZE 2048
699+
#endif
700+
#ifndef MAX_SHARED_SECRET_SIZE
701+
#define MAX_SHARED_SECRET_SIZE 64
702+
#endif
703+
#endif /* WOLFTPM_V185 */
692704
#ifndef HASH_COUNT
693705
#ifndef WOLFTPM2_NO_WOLFCRYPT
694706
/* Calculate hash count based on wolfCrypt enables */

0 commit comments

Comments
 (0)