commit a235b5b5bd551172e0e41598c0b909119f3e2628
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 13:25:52 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 03 13:25:52 2013 +0200
tree 420224632bd81a75c1cf9e6a32c44cee2abdfb40
parent 9c853b910c612775b4ad0db578ad76d8c7ba8b45

Fix iv_len interface.

cipher_info->iv_size == 0 is no longer ambiguous, and
cipher_get_iv_size() always returns something useful to generate an IV.

library/pkcs12.c

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