diff options
| author | Werner Koch <[email protected]> | 1998-08-11 17:29:34 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1998-08-11 17:29:34 +0000 |
| commit | 3e0e8f884f1ed37e120beeb57aa7cd79e3c145a0 (patch) | |
| tree | dfff62df60f917addc9df4e83a1ed73e31041bab /g10/parse-packet.c | |
| parent | rel 0.3.3 (diff) | |
| download | gnupg-3e0e8f884f1ed37e120beeb57aa7cd79e3c145a0.tar.gz gnupg-3e0e8f884f1ed37e120beeb57aa7cd79e3c145a0.zip | |
bug fix releaseV0-3-4
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index f534cbbdd..bc7aca510 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1068,15 +1068,14 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen, sk->protect.s2k.count = iobuf_get(inp); pktlen--; } - } else { /* old version; no S2K, so we set mode to 0, hash MD5 */ sk->protect.s2k.mode = 0; /* We need a kludge to cope with old GNUPG versions */ sk->protect.s2k.hash_algo = - ( sk->protect.algo == CIPHER_ALGO_BLOWFISH160 - && algorithm == PUBKEY_ALGO_ELGAMAL_E ) ? - DIGEST_ALGO_RMD160 : DIGEST_ALGO_MD5; + ( sk->protect.algo == CIPHER_ALGO_BLOWFISH160 + && algorithm == PUBKEY_ALGO_ELGAMAL_E ) ? + DIGEST_ALGO_RMD160 : DIGEST_ALGO_MD5; if( list_mode ) printf( "\tprotect algo: %d (hash algo: %d)\n", sk->protect.algo, sk->protect.s2k.hash_algo ); |