commit 9c853b910c612775b4ad0db578ad76d8c7ba8b45
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 13:04:44 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 13:04:44 2013 +0200
tree 902b0634a984397c6219e9e2e6c93728c7b41874
parent 9241be7ac56cf5bf76487e77f710961eaddc762b

Split cipher_set_iv() out of cipher_reset()

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index 9ccb60a..3634ce1 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -184,7 +184,10 @@
     if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 )
         goto exit;
 
-    if( ( ret = cipher_reset( &cipher_ctx, iv, 0, NULL, 0 ) ) != 0 )
+    if( ( ret = cipher_set_iv( &cipher_ctx, iv, 0 ) ) != 0 )
+        goto exit;
+
+    if( ( ret = cipher_reset( &cipher_ctx, iv, 0 ) ) != 0 )
         goto exit;
 
     if( ( ret = cipher_update( &cipher_ctx, data, len,