* parse-packet.c (parse_key): Parse a secret key encrypted with
authorDavid Shaw <dshaw@jabberwocky.com>
Mon, 17 Mar 2008 18:20:39 +0000 (18:20 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Mon, 17 Mar 2008 18:20:39 +0000 (18:20 +0000)
Camellia.

g10/ChangeLog
g10/parse-packet.c

index dbd7533..52f75bc 100644 (file)
@@ -1,3 +1,8 @@
+2008-03-17  David Shaw  <dshaw@jabberwocky.com>
+
+       * parse-packet.c (parse_key): Parse a secret key encrypted with
+       Camellia.
+
 2008-02-09  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpg.c (main): New variable default_configname.  Use it if
index 9fb73a9..e0c0681 100644 (file)
@@ -1854,8 +1854,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: