Fixed bug involving manually-specified IV not being used in some circumstances.

Author: lstein

Changes

@@ -1,4 +1,7 @@
 Revision history for Perl extension Crypt::CBC.
+3.04	 Mon 17 May 2021 10:58:37 AM EDT
+        - Fixed bug involving manually-specified IV not being used in some circumstances.
+	
 3.03    Sun 18 Apr 2021 10:54:19 PM EDT
 	- Fixed bug which caused an extraneous block of garbage data to be appended to encrypted
 	  string when "nopadding" specified and plaintext is even multiple of blocksize.

lib/Crypt/CBC.pm

@@ -6,7 +6,7 @@ use Crypt::CBC::PBKDF;
 use bytes;
 use vars qw($VERSION);
 no warnings 'uninitialized';
-$VERSION = '3.03';
+$VERSION = '3.04';
 
 use constant RANDOM_DEVICE      => '/dev/urandom';
 use constant DEFAULT_PBKDF      => 'opensslv1';
@@ -97,6 +97,7 @@ sub new {
 	    'keysize'     => $ks,
 	    'header_mode' => $header_mode,
 	    'literal_key' => $literal_key,
+	    'literal_iv'  => defined $iv,
 	    'chain_mode'  => $chain_mode,    
 	    'make_random_salt' => $random_salt,
 	    'make_random_iv'   => $random_iv,
@@ -143,7 +144,7 @@ sub encrypt_hex (\$$) {
 
 sub decrypt_hex (\$$) {
     my ($self,$data) = @_;
-    return $self->decrypt(pack'H*',$data);
+    return $self->decrypt(pack 'H*',$data);
 }
 
 # call to start a series of encryption/decryption operations
@@ -651,7 +652,9 @@ sub _read_key_and_iv {
 	($self->{salt}) = $$input_stream =~ /^Salted__(.{8})/s;
 	croak "Ciphertext does not begin with a valid header for 'salt' header mode" unless defined $self->{salt};
 	substr($$input_stream,0,16) = '';
-	($self->{key},$self->{iv}) = $self->pbkdf_obj->key_and_iv($self->{salt},$self->{passphrase});
+	my ($k,$i) = $self->pbkdf_obj->key_and_iv($self->{salt},$self->{passphrase});
+	$self->{key} = $k unless $self->{literal_key};
+	$self->{iv}  = $i unless $self->{literal_iv};
     }
 
     elsif ($header_mode eq 'randomiv') {

t/parameters.t

@@ -62,9 +62,9 @@ test($old_salt ne $crypt->salt, "salt didn't change after an encrypt");
 test($old_key  ne $crypt->key,  "key didn't change after an encrypt");
 
 test($plaintext eq $crypt->decrypt($ciphertext1),"decrypted text doesn't match original");
-test($old_iv   eq $crypt->iv,    "original IV wasn't restored after decryption");
-test($old_salt eq $crypt->salt,  "original salt wasn't restored after decryption");
-test($old_key  eq $crypt->key,   "original key wasn't restored after decryption");
+test($old_iv    eq $crypt->iv,    "original IV wasn't restored after decryption");
+test($old_salt  eq $crypt->salt,  "original salt wasn't restored after decryption");
+test($old_key   eq $crypt->key,   "original key wasn't restored after decryption");
 
 test($crypt->passphrase eq 'test key',"get passphrase()");
 $crypt->passphrase('new key');