commit aa9ffc5e98f1c375efb6787e12d6537da2e99327
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 16:19:22 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 19:20:55 2013 +0200
tree 25de0fd4e404708dda0a5813199fcb9a64bd84cd
parent 2adc40c346344d490713a497743bc63a93eecd5c

Split tag handling out of cipher_finish()

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index 98ebd88..335af7e 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -196,11 +196,8 @@
         goto exit;
     }
 
-    if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen, NULL, 0 ) )
-                != 0 )
-    {
+    if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
         ret = POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH;
-    }
 
 exit:
     cipher_free_ctx( &cipher_ctx );