summaryrefslogtreecommitdiffstats
path: root/g10/passphrase.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2002-09-10 10:40:12 +0200
committerWerner Koch <wk@gnupg.org>2002-09-10 10:40:12 +0200
commitb324a5d2d14c33bdd4549b2e84f189d4ef0cabe6 (patch)
tree580a40b65f6957a56573812edf355f3c666aa38f /g10/passphrase.c
parentAdded prototype. (diff)
downloadgnupg2-b324a5d2d14c33bdd4549b2e84f189d4ef0cabe6.tar.xz
gnupg2-b324a5d2d14c33bdd4549b2e84f189d4ef0cabe6.zip
Cleanups and minor fixes.
Diffstat (limited to 'g10/passphrase.c')
-rw-r--r--g10/passphrase.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 7c4f78f68..0da40e3c0 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -1115,13 +1115,7 @@ hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create )
md = md_open( s2k->hash_algo, 1);
for(pass=0; used < dek->keylen ; pass++ ) {
if( pass ) {
- if( (opt.emulate_bugs & EMUBUG_3DESS2K)) {
- int tmp = md->finalized;
- md_reset( md );
- md->finalized = tmp;
- }
- else
- md_reset(md);
+ md_reset(md);
for(i=0; i < pass; i++ ) /* preset the hash context */
md_putc(md, 0 );
}