Merge pull request #7806 from SparkiDev/dilithium_der_fix

Dilithium: DER encoding fix
This commit is contained in:
Daniel Pouzzner
2024-07-30 09:43:39 -05:00
committed by GitHub

View File

@ -33388,7 +33388,7 @@ static int test_wc_dilithium_der(void)
ExpectIntEQ(wc_Dilithium_PublicKeyToDer(NULL, der , DILITHIUM_MAX_DER_SIZE, ExpectIntEQ(wc_Dilithium_PublicKeyToDer(NULL, der , DILITHIUM_MAX_DER_SIZE,
0), BAD_FUNC_ARG); 0), BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_PublicKeyToDer(key , der , 0 , ExpectIntEQ(wc_Dilithium_PublicKeyToDer(key , der , 0 ,
0), BUFFER_E); 0), BUFFER_E );
/* Get length only. */ /* Get length only. */
ExpectIntEQ(wc_Dilithium_PublicKeyToDer(key , NULL, 0 , ExpectIntEQ(wc_Dilithium_PublicKeyToDer(key , NULL, 0 ,
0), pubLen); 0), pubLen);
@ -33401,8 +33401,8 @@ static int test_wc_dilithium_der(void)
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, NULL, ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, NULL,
0 ), BAD_FUNC_ARG); 0 ), BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(key , NULL, ExpectIntGT(wc_Dilithium_PrivateKeyToDer(key , NULL,
0 ), BAD_FUNC_ARG); 0 ), 0);
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, der , ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, der ,
0 ), BAD_FUNC_ARG); 0 ), BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, NULL, ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, NULL,
@ -33410,15 +33410,15 @@ static int test_wc_dilithium_der(void)
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, der , ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(NULL, der ,
DILITHIUM_MAX_DER_SIZE), BAD_FUNC_ARG); DILITHIUM_MAX_DER_SIZE), BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(key , der , ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(key , der ,
0 ), BAD_FUNC_ARG); 0 ), BUFFER_E);
/* Get length only. */ /* Get length only. */
ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(key , NULL, ExpectIntEQ(wc_Dilithium_PrivateKeyToDer(key , NULL,
DILITHIUM_MAX_DER_SIZE), privDerLen); DILITHIUM_MAX_DER_SIZE), privDerLen);
ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, NULL, 0 ), ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, NULL, 0 ),
BAD_FUNC_ARG); BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_KeyToDer(key , NULL, 0 ), ExpectIntGT(wc_Dilithium_KeyToDer(key , NULL, 0 ),
BAD_FUNC_ARG); 0 );
ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, der , 0 ), ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, der , 0 ),
BAD_FUNC_ARG); BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, NULL, DILITHIUM_MAX_DER_SIZE), ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, NULL, DILITHIUM_MAX_DER_SIZE),
@ -33426,7 +33426,7 @@ static int test_wc_dilithium_der(void)
ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, der , DILITHIUM_MAX_DER_SIZE), ExpectIntEQ(wc_Dilithium_KeyToDer(NULL, der , DILITHIUM_MAX_DER_SIZE),
BAD_FUNC_ARG); BAD_FUNC_ARG);
ExpectIntEQ(wc_Dilithium_KeyToDer(key , der , 0 ), ExpectIntEQ(wc_Dilithium_KeyToDer(key , der , 0 ),
BAD_FUNC_ARG); BUFFER_E );
/* Get length only. */ /* Get length only. */
ExpectIntEQ(wc_Dilithium_KeyToDer(key , NULL, DILITHIUM_MAX_DER_SIZE), ExpectIntEQ(wc_Dilithium_KeyToDer(key , NULL, DILITHIUM_MAX_DER_SIZE),
keyDerLen); keyDerLen);