diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/parse-packet.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index d00a58ac0..4d380a70d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 David Shaw <[email protected]> + + * parse-packet.c (parse_key): Add constant for Camellia-192. + 2008-04-12 David Shaw <[email protected]> * getkey.c (merge_selfsigs_subkey): If there are multiple 0x19 diff --git a/g10/parse-packet.c b/g10/parse-packet.c index e0c068167..61c289cf8 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1,6 +1,6 @@ /* parse-packet.c - read packets - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1856,7 +1856,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen, switch( sk->protect.algo ) { case 7: case 8: case 9: /* AES */ case 10: /* Twofish */ - case 11: case 12: /* Camellia */ + case 11: case 12: case 13: /* Camellia */ sk->protect.ivlen = 16; break; default: |