Split cipher_set_iv() out of cipher_reset()
diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index a9b862e..8ffdb9f 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -306,7 +306,12 @@
fprintf( stderr, "cipher_setkey() returned error\n");
goto exit;
}
- if( cipher_reset( &cipher_ctx, IV, 16, NULL, 0 ) != 0 )
+ if( cipher_set_iv( &cipher_ctx, IV, 16 ) != 0 )
+ {
+ fprintf( stderr, "cipher_set_iv() returned error\n");
+ goto exit;
+ }
+ if( cipher_reset( &cipher_ctx, NULL, 0 ) != 0 )
{
fprintf( stderr, "cipher_reset() returned error\n");
goto exit;
@@ -424,7 +429,8 @@
cipher_setkey( &cipher_ctx, digest, cipher_info->key_length,
POLARSSL_DECRYPT );
- cipher_reset( &cipher_ctx, IV, 16, NULL, 0 );
+ cipher_set_iv( &cipher_ctx, IV, 16 );
+ cipher_reset( &cipher_ctx, NULL, 0 );
md_hmac_starts( &md_ctx, digest, 32 );