mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-23 20:08:04 +01:00
* parse-packet.c (parse_key): Parse a secret key encrypted with
Camellia.
This commit is contained in:
parent
fc41626a9b
commit
a614eabba9
@ -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>
|
2008-02-09 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
* gpg.c (main): New variable default_configname. Use it if
|
* gpg.c (main): New variable default_configname. Use it if
|
||||||
|
@ -1854,8 +1854,9 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
|
|||||||
* enlarge temp.
|
* enlarge temp.
|
||||||
*/
|
*/
|
||||||
switch( sk->protect.algo ) {
|
switch( sk->protect.algo ) {
|
||||||
case 7: case 8: case 9: /* reserved for AES */
|
case 7: case 8: case 9: /* AES */
|
||||||
case 10: /* Twofish */
|
case 10: /* Twofish */
|
||||||
|
case 11: case 12: /* Camellia */
|
||||||
sk->protect.ivlen = 16;
|
sk->protect.ivlen = 16;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user