fixed test vectors for nocrypt

all-lwc-submission-files/nocrypt/Implementations/crypto_aead/nocrypt/ref/genkat_aead.c

@@ -73,10 +73,9 @@ int generate_test_vectors()
 	unsigned char       key[CRYPTO_KEYBYTES];
 	unsigned char		nonce[CRYPTO_NPUBBYTES];
 	unsigned char       msg[MAX_MESSAGE_LENGTH];
-	unsigned char       msgbuf[MAX_MESSAGE_LENGTH];
-	unsigned char       ct[MAX_MESSAGE_LENGTH + CRYPTO_ABYTES];
 	unsigned char       msg2[MAX_MESSAGE_LENGTH];
 	unsigned char		ad[MAX_ASSOCIATED_DATA_LENGTH];
+	unsigned char		ct[MAX_MESSAGE_LENGTH + CRYPTO_ABYTES];
 	unsigned long long  clen, mlen2;
 	int                 count = 1;
 	int                 func_ret, ret_val = KAT_SUCCESS;
@@ -94,54 +93,50 @@ int generate_test_vectors()
 	}
 
 	for (unsigned long long mlen = 0; (mlen <= MAX_MESSAGE_LENGTH) && (ret_val == KAT_SUCCESS); mlen++) {
+	  //for (unsigned long long mlen = 0; (mlen <= 32) && (ret_val == KAT_SUCCESS); mlen++) {
+	  for (unsigned long long adlen = 0; adlen <= MAX_ASSOCIATED_DATA_LENGTH; adlen++) {
+	    //for (unsigned long long adlen = 0; adlen <= 32; adlen++) {
 
-		for (unsigned long long adlen = 0; adlen <= MAX_ASSOCIATED_DATA_LENGTH; adlen++) {
-
+	    printf("%0d\n", (int)clen);
 
 			fprintf(fp, "Count = %d\n", count++);
+			printf("Count = %d\n", count - 1);
 
 			fprint_bstr(fp, "Key = ", key, CRYPTO_KEYBYTES);
 
 			fprint_bstr(fp, "Nonce = ", nonce, CRYPTO_NPUBBYTES);
-		
-			unsigned long long mlenp = ((mlen + 15) >> 4) << 4;
-
-			memset(msgbuf, 0, mlenp);
-			memcpy(msgbuf, msg, mlen);
 
-			fprint_bstr(fp, "PT = ", msgbuf, mlenp);
+			fprint_bstr(fp, "PT = ", msg, mlen);
 
 			fprint_bstr(fp, "AD = ", ad, adlen);
 
-			if ((func_ret = crypto_aead_encrypt(ct, &clen, msgbuf, mlenp, ad, adlen, NULL, nonce, key)) != 0) {
+			if ((func_ret = crypto_aead_encrypt(ct, &clen, msg, mlen, ad, adlen, NULL, nonce, key)) != 0) {
 				fprintf(fp, "crypto_aead_encrypt returned <%d>\n", func_ret);
 				ret_val = KAT_CRYPTO_FAILURE;
 				break;
 			}
-
+			
 			fprint_bstr(fp, "CT = ", ct, clen);
 
 			fprintf(fp, "\n");
 
-
-			if ((func_ret = crypto_aead_decrypt(msg2, &mlen2, NULL, ct, clen, ad, adlen, nonce, key)) != 0) {
-				fprintf(fp, "crypto_aead_decrypt returned <%d>\n", func_ret);
-				ret_val = KAT_CRYPTO_FAILURE;
-			  fprint_bstr(fp, "PT = ", msg2, mlen2);
-				break;
-			}
-
-			if (mlenp != mlen2) {
-				fprintf(fp, "crypto_aead_decrypt returned bad 'mlen': Got <%llu>, expected <%llu>\n", mlen2, mlenp);
-				ret_val = KAT_CRYPTO_FAILURE;
-				break;
-			}
-
-			if (memcmp(msgbuf, msg2, mlenp)) {
-				fprintf(fp, "crypto_aead_decrypt did not recover the plaintext\n");
-				ret_val = KAT_CRYPTO_FAILURE;
-				break;
-			}
+			 if ((func_ret = crypto_aead_decrypt(msg2, &mlen2, NULL, ct, clen, ad, adlen, nonce, key)) != 0) { 
+			 	fprintf(fp, "crypto_aead_decrypt returned <%d>\n", func_ret); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
+
+			 if (mlen != mlen2) { 
+			 	fprintf(fp, "crypto_aead_decrypt returned bad 'mlen': Got <%llu>, expected <%llu>\n", mlen2, mlen); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
+
+			 if (memcmp(msg, msg2, mlen)) { 
+			 	fprintf(fp, "crypto_aead_decrypt did not recover the plaintext\n"); 
+			 	ret_val = KAT_CRYPTO_FAILURE; 
+			 	break; 
+			 } 
 		}
 	}