Commit a80d0e2c authored by Mike Hibler's avatar Mike Hibler
Browse files

When invoked via frisbee, make sure cipher arg is set correctly.

parent 0da9a93c
...@@ -943,6 +943,9 @@ ImageUnzipInitKeys(char *uuidstr, char *sig_keyfile, char *enc_keyfile) ...@@ -943,6 +943,9 @@ ImageUnzipInitKeys(char *uuidstr, char *sig_keyfile, char *enc_keyfile)
if (!encrypt_readkey(enc_keyfile, if (!encrypt_readkey(enc_keyfile,
encryption_key, sizeof(encryption_key))) encryption_key, sizeof(encryption_key)))
exit(1); exit(1);
/* XXX can you intuit the cipher from the key? */
if (cipher == ENC_NONE)
cipher = ENC_BLOWFISH_CBC;
do_decrypt = 1; do_decrypt = 1;
} }
#else #else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment