diff options
| author | David Shaw <[email protected]> | 2008-03-17 18:20:39 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2008-03-17 18:20:39 +0000 |
| commit | a614eabba9c2566f762d9566803f395a2bf6f6ac (patch) | |
| tree | 6b7409a5e303d04ca397c8b2102102ccb8295ba4 | |
| parent | * configure.ac: Darwin's /bin/sh has a builtin echo that doesn't (diff) | |
| download | gnupg-a614eabba9c2566f762d9566803f395a2bf6f6ac.tar.gz gnupg-a614eabba9c2566f762d9566803f395a2bf6f6ac.zip | |
* parse-packet.c (parse_key): Parse a secret key encrypted with
Camellia.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/parse-packet.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index dbd7533c2..52f75bc61 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-03-17 David Shaw <[email protected]> + + * parse-packet.c (parse_key): Parse a secret key encrypted with + Camellia. + 2008-02-09 Marcus Brinkmann <[email protected]> * gpg.c (main): New variable default_configname. Use it if diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 9fb73a956..e0c068167 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -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: |