commit 9241be7ac56cf5bf76487e77f710961eaddc762b
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Sat Aug 31 17:31:03 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Sat Aug 31 18:07:42 2013 +0200
tree cf739d247c8376ded80a88dc72aab68c757745d6
parent 20d6a17af99ad538db902dbebf16879c0b3de687

Change cipher prototypes for GCM

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index e0d7207..9ccb60a 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -184,7 +184,7 @@
     if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 )
         goto exit;
 
-    if( ( ret = cipher_reset( &cipher_ctx, iv ) ) != 0 )
+    if( ( ret = cipher_reset( &cipher_ctx, iv, 0, NULL, 0 ) ) != 0 )
         goto exit;
 
     if( ( ret = cipher_update( &cipher_ctx, data, len,
@@ -193,8 +193,11 @@
         goto exit;
     }
 
-    if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
+    if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen, NULL, 0 ) )
+                != 0 )
+    {
         ret = POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH;
+    }
 
 exit:
     cipher_free_ctx( &cipher_ctx );