security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Add Camellia-192.

Browse source
This commit is contained in:
David Shaw 2008-04-17 17:40:30 +00:00
parent 06278768b4
commit 18f6e7e5d8
7 changed files with 58 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
g10/ChangeLog
View file

@ -1,3 +1,7 @@
2008-04-17 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (parse_key): Add constant for Camellia-192.
2008-04-12 David Shaw <dshaw@jabberwocky.com>
* getkey.c (merge_selfsigs_subkey): If there are multiple 0x19

6
g10/parse-packet.c
View file

@ -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: