diff options
| author | Werner Koch <[email protected]> | 1999-04-09 10:34:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-04-09 10:34:44 +0000 |
| commit | 02d018f9c84c8f3462ff30c2f5336a3acbc9cd38 (patch) | |
| tree | 0ac69079ad82fc3c6767fa571428da93d091ef81 /g10/parse-packet.c | |
| parent | See ChangeLog: Thu Apr 8 09:35:53 CEST 1999 Werner Koch (diff) | |
| download | gnupg-02d018f9c84c8f3462ff30c2f5336a3acbc9cd38.tar.gz gnupg-02d018f9c84c8f3462ff30c2f5336a3acbc9cd38.zip | |
See ChangeLog: Fri Apr 9 12:26:25 CEST 1999 Werner Koch
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index bf22f10dc..1683df0a2 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1305,11 +1305,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long 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.s2k.hash_algo = DIGEST_ALGO_MD5; if( list_mode ) printf( "\tprotect algo: %d (hash algo: %d)\n", sk->protect.algo, sk->protect.s2k.hash_algo ); |