fixes example submissions

example-submissions/aes/Implementations/crypto_aead/aes128k96n/mbed/gcm.c → example-submissions/aes/Implementations/crypto_aead/aes128k96n/mbedtls/gcm.c

@@ -97,18 +97,19 @@ int crypto_aead_encrypt(
   mbedtls_gcm_context ctx;
   mbedtls_gcm_context ctx;
   mbedtls_aes_context aes;
   mbedtls_aes_context aes;
   int ret;
   int ret;
-  unsigned long long mask = 15;
-  unsigned long long mlenp = (mlen + mask) & (~mask);
   unsigned char tag_buf[CRYPTO_ABYTES];
   unsigned char tag_buf[CRYPTO_ABYTES];
-  *clen = mlenp + CRYPTO_ABYTES;
+  *clen = mlen + CRYPTO_ABYTES;
 
 
   mbedtls_gcm_init( &ctx );
   mbedtls_gcm_init( &ctx );
   ctx.cipher_ctx.cipher_ctx = &aes;
   ctx.cipher_ctx.cipher_ctx = &aes;
   ret = mbedtls_gcm_setkey( &ctx, k, 128);
   ret = mbedtls_gcm_setkey( &ctx, k, 128);
+  if (ret != 0) {
+    return ret;
+  }
   ret = mbedtls_gcm_crypt_and_tag( &ctx, 1, mlen, npub, 12, ad, adlen, m, c, 16, tag_buf );
   ret = mbedtls_gcm_crypt_and_tag( &ctx, 1, mlen, npub, 12, ad, adlen, m, c, 16, tag_buf );
   mbedtls_gcm_free( &ctx );
   mbedtls_gcm_free( &ctx );
   mbedtls_platform_zeroize( &aes, sizeof( aes ) );
   mbedtls_platform_zeroize( &aes, sizeof( aes ) );
-  memcpy(c + mlenp, tag_buf, CRYPTO_ABYTES);
+  memcpy(c + mlen, tag_buf, CRYPTO_ABYTES);
   return ret;
   return ret;
 }
 }
 
 

example-submissions/aes/Implementations/crypto_aead/aes128k96n/mbed/genkat_aead.c → example-submissions/aes/Implementations/crypto_aead/aes128k96n/mbedtls/genkat_aead.c

@@ -73,10 +73,9 @@ int generate_test_vectors()
 	unsigned char       key[CRYPTO_KEYBYTES];
 	unsigned char       key[CRYPTO_KEYBYTES];
 	unsigned char		nonce[CRYPTO_NPUBBYTES];
 	unsigned char		nonce[CRYPTO_NPUBBYTES];
 	unsigned char       msg[MAX_MESSAGE_LENGTH];
 	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       msg2[MAX_MESSAGE_LENGTH];
 	unsigned char		ad[MAX_ASSOCIATED_DATA_LENGTH];
 	unsigned char		ad[MAX_ASSOCIATED_DATA_LENGTH];
+	unsigned char		ct[MAX_MESSAGE_LENGTH + CRYPTO_ABYTES];
 	unsigned long long  clen, mlen2;
 	unsigned long long  clen, mlen2;
 	int                 count = 1;
 	int                 count = 1;
 	int                 func_ret, ret_val = KAT_SUCCESS;
 	int                 func_ret, ret_val = KAT_SUCCESS;
@@ -97,23 +96,17 @@ int generate_test_vectors()
 
 
 		for (unsigned long long adlen = 0; adlen <= MAX_ASSOCIATED_DATA_LENGTH; adlen++) {
 		for (unsigned long long adlen = 0; adlen <= MAX_ASSOCIATED_DATA_LENGTH; adlen++) {
 
 
-
 			fprintf(fp, "Count = %d\n", count++);
 			fprintf(fp, "Count = %d\n", count++);
 
 
 			fprint_bstr(fp, "Key = ", key, CRYPTO_KEYBYTES);
 			fprint_bstr(fp, "Key = ", key, CRYPTO_KEYBYTES);
 
 
 			fprint_bstr(fp, "Nonce = ", nonce, CRYPTO_NPUBBYTES);
 			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);
 			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);
 				fprintf(fp, "crypto_aead_encrypt returned <%d>\n", func_ret);
 				ret_val = KAT_CRYPTO_FAILURE;
 				ret_val = KAT_CRYPTO_FAILURE;
 				break;
 				break;
@@ -123,21 +116,22 @@ int generate_test_vectors()
 
 
 			fprintf(fp, "\n");
 			fprintf(fp, "\n");
 
 
-
 			if ((func_ret = crypto_aead_decrypt(msg2, &mlen2, NULL, ct, clen, ad, adlen, nonce, key)) != 0) {
 			if ((func_ret = crypto_aead_decrypt(msg2, &mlen2, NULL, ct, clen, ad, adlen, nonce, key)) != 0) {
+                fprint_bstr(fp, "PT = ", msg2, mlen2);
+
+                fprintf(fp, "\n");
 				fprintf(fp, "crypto_aead_decrypt returned <%d>\n", func_ret);
 				fprintf(fp, "crypto_aead_decrypt returned <%d>\n", func_ret);
 				ret_val = KAT_CRYPTO_FAILURE;
 				ret_val = KAT_CRYPTO_FAILURE;
-			  fprint_bstr(fp, "PT = ", msg2, mlen2);
 				break;
 				break;
 			}
 			}
 
 
-			if (mlenp != mlen2) {
-				fprintf(fp, "crypto_aead_decrypt returned bad 'mlen': Got <%llu>, expected <%llu>\n", mlen2, mlenp);
+			if (mlen != mlen2) {
+				fprintf(fp, "crypto_aead_decrypt returned bad 'mlen': Got <%llu>, expected <%llu>\n", mlen2, mlen);
 				ret_val = KAT_CRYPTO_FAILURE;
 				ret_val = KAT_CRYPTO_FAILURE;
 				break;
 				break;
 			}
 			}
 
 
-			if (memcmp(msgbuf, msg2, mlenp)) {
+			if (memcmp(msg, msg2, mlen)) {
 				fprintf(fp, "crypto_aead_decrypt did not recover the plaintext\n");
 				fprintf(fp, "crypto_aead_decrypt did not recover the plaintext\n");
 				ret_val = KAT_CRYPTO_FAILURE;
 				ret_val = KAT_CRYPTO_FAILURE;
 				break;
 				break;
@@ -166,3 +160,4 @@ void init_buffer(unsigned char *buffer, unsigned long long numbytes)
 	for (unsigned long long i = 0; i < numbytes; i++)
 	for (unsigned long long i = 0; i < numbytes; i++)
 		buffer[i] = (unsigned char)i;
 		buffer[i] = (unsigned char)i;
 }
 }
+