Merge pull request #7 from pghmcfc/header-randomiv

lstein · web-flow · commit 393fff6cf11b · 2023-09-05T10:26:57.000-04:00
Fix decryption of ciphertext created with 'header' =&gt; 'randomiv'
diff --git a/lib/Crypt/CBC.pm b/lib/Crypt/CBC.pm
@@ -661,7 +661,7 @@ sub _read_key_and_iv {
 	croak "Ciphertext does not begin with a valid header for 'randomiv' header mode" unless defined $self->{iv};
 	croak "randomiv header mode cannot be used securely when decrypting with a >8 byte block cipher.\n"
 	    unless $self->blocksize == 8;
-	(undef,$self->{key}) = $self->pbkdf_obj->key_and_iv(undef,$self->{passphrase});
+	($self->{key},undef) = $self->pbkdf_obj->key_and_iv(undef,$self->{passphrase});
 	substr($$input_stream,0,16) = ''; # truncate
     }
 

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ sub _read_key_and_iv {`
`661`	`661`	`croak "Ciphertext does not begin with a valid header for 'randomiv' header mode" unless defined $self->{iv};`
`662`	`662`	`croak "randomiv header mode cannot be used securely when decrypting with a >8 byte block cipher.\n"`
`663`	`663`	`unless $self->blocksize == 8;`
`664`		`- (undef,$self->{key}) = $self->pbkdf_obj->key_and_iv(undef,$self->{passphrase});`
	`664`	`+ ($self->{key},undef) = $self->pbkdf_obj->key_and_iv(undef,$self->{passphrase});`
`665`	`665`	`substr($$input_stream,0,16) = ''; # truncate`
`666`	`666`	`}`
`667`	`667`