commit 0f2eacbd09da84b8cdf781868f148b067da2783d
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Nov 25 17:55:17 2013 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Nov 26 15:19:57 2013 +0100
tree aed64c152f335b6301db8cb9e487042c9227c5ea
parent da1ff38715a0a8f9f887b6dbfa027d7c5d694f72

crypt_and_hash: check MAC earlier

programs/aes/crypt_and_hash.c

diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index 50218e1..333f10e 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -456,17 +456,6 @@
         }
 
         /*
-         * Write the final block of data
-         */
-        cipher_finish( &cipher_ctx, output, &olen );
-
-        if( fwrite( output, 1, olen, fout ) != olen )
-        {
-            fprintf( stderr, "fwrite(%ld bytes) failed\n", (long) olen );
-            goto exit;
-        }
-
-        /*
          * Verify the message authentication code.
          */
         md_hmac_finish( &md_ctx, digest );
@@ -488,6 +477,17 @@
                              "or file corrupted.\n" );
             goto exit;
         }
+
+        /*
+         * Write the final block of data
+         */
+        cipher_finish( &cipher_ctx, output, &olen );
+
+        if( fwrite( output, 1, olen, fout ) != olen )
+        {
+            fprintf( stderr, "fwrite(%ld bytes) failed\n", (long) olen );
+            goto exit;
+        }
     }
 
     ret = 0;