diff -r 27f0c30c5240 -r f1fea4381014 bin/imager.restore --- a/bin/imager.restore Sun Jul 31 23:22:07 2011 +0200 +++ b/bin/imager.restore Sun Jul 31 23:22:59 2011 +0200 @@ -5,7 +5,7 @@ # elif test -f DATA/$f.gz then zcat DATA/$f.gz # elif test -f DATA/$f.x then openssl aes-128-cbc -d -in DATA/$f.x # elif test -f DATA/$f.gz.x then openssl aes-128-cbc -d -in DATA/$f.gz.x | zcat -# elif test -f DATA/$f.x.gz then zcat DATA/$f.x.gz | openssl aes-128-cbs -d +# elif test -f DATA/$f.x.gz then zcat DATA/$f.x.gz | openssl aes-128-cbs -d # fi # done @@ -20,10 +20,10 @@ use Hash::Util qw(lock_keys); use IO::Uncompress::Gunzip qw(gunzip $GunzipError); -use constant KiB => 1024; -use constant MiB => 1024 * KiB; -use constant GiB => 1024 * MiB; -use constant ME => basename $0; +use constant KiB => 1024; +use constant MiB => 1024 * KiB; +use constant GiB => 1024 * MiB; +use constant ME => basename $0; use constant CIPHER => "aes-128-cbc"; my %o = (pass => "stdin"); @@ -83,13 +83,15 @@ or die $GunzipError; } elsif (-f "$data/$path.x") { - open($in, "openssl @{[CIPHER]} -d -pass $o{pass} -in '$data/$path.x'|"); + open($in, + "openssl @{[CIPHER]} -d -pass $o{pass} -in '$data/$path.x'|"); binmode($in); local $/ = undef; $buffer = <$in>; } elsif (-f "$data/$path.gz.x") { - open($in, "openssl @{[CIPHER]} -d -pass $o{pass} -in $data/$path.gz.x|"); + open($in, + "openssl @{[CIPHER]} -d -pass $o{pass} -in $data/$path.gz.x|"); binmode($in); gunzip($in => \$buffer) or die $GunzipError; @@ -97,7 +99,8 @@ elsif (-f "$data/$path.x.gz") { warn "$data/$path.x.gz: depreciated!\n"; open($in, - "gzip -d -c $data/$path.x.gz | openssl @{[CIPHER]} -d -pass $o{pass}|"); +"gzip -d -c $data/$path.x.gz | openssl @{[CIPHER]} -d -pass $o{pass}|" + ); binmode($in); local $/ = undef; $buffer = <$in>;