aboutsummaryrefslogtreecommitdiffstats
path: root/g10/parse-packet.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2008-03-25 08:33:31 +0000
committerWerner Koch <[email protected]>2008-03-25 08:33:31 +0000
commitd7f0b3bd897c6d154f39932897021a8b8a97567f (patch)
tree19cceacc2dfacc4564991c5b5c129d364febe1bc /g10/parse-packet.c
parentFix a bug in the ambigious name detection. (diff)
downloadgnupg-d7f0b3bd897c6d154f39932897021a8b8a97567f.tar.gz
gnupg-d7f0b3bd897c6d154f39932897021a8b8a97567f.zip
Fix bug 894.
Change default keyserver. Allow key protection with Camellia.
Diffstat (limited to '')
-rw-r--r--g10/parse-packet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 6b8e79ec1..409daab09 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1906,8 +1906,9 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
* enlarge temp.
*/
switch( sk->protect.algo ) {
- case 7: case 8: case 9: /* reserved for AES */
+ case 7: case 8: case 9: /* AES */
case 10: /* Twofish */
+ case 11: case 12: /* Camellia */
sk->protect.ivlen = 16;
break;
default: