From 2e0ce7d97f0de998cdf8e95e17ce169b7cae91cd Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 24 Jun 2009 14:03:09 +0000
Subject: Fixed a bunch of little bugs as reported by Fabian Keil. Still one
 problem left; marked with a gcc #warning.

---
 g10/passphrase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'g10/passphrase.c')

diff --git a/g10/passphrase.c b/g10/passphrase.c
index 3742738e9..d34f5fa92 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -600,7 +600,7 @@ passphrase_to_dek_ext (u32 *keyid, int pubkey_algo,
      get_last_passphrase(). */
   dek = xmalloc_secure_clear ( sizeof *dek );
   dek->algo = cipher_algo;
-  if ( !*pw && (mode == 2 || mode == 4))
+  if ( (!pw || !*pw) && (mode == 2 || mode == 4))
     dek->keylen = 0;
   else
     hash_passphrase (dek, pw, s2k);
-- 
cgit v1.2.3