[svn] GnuPG - r4708 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2008-03-17 19:20:39 +0100 (Mon, 17 Mar 2008)
New Revision: 4708

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/parse-packet.c
Log:
* parse-packet.c (parse_key): Parse a secret key encrypted with
Camellia.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-03-13 08:46:08 UTC (rev 4707)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-03-17 18:20:39 UTC (rev 4708)
@@ -1,3 +1,8 @@
+2008-03-17  David Shaw  <dshaw at jabberwocky.com>
+
+	* parse-packet.c (parse_key): Parse a secret key encrypted with
+	Camellia.
+
 2008-02-09  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg.c (main): New variable default_configname.  Use it if

Modified: branches/STABLE-BRANCH-1-4/g10/parse-packet.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/parse-packet.c	2008-03-13 08:46:08 UTC (rev 4707)
+++ branches/STABLE-BRANCH-1-4/g10/parse-packet.c	2008-03-17 18:20:39 UTC (rev 4708)
@@ -1854,8 +1854,9 @@
 	     * 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: