From 7f803fd58dd1d4e66cb113969e61512f44017b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 27 Mar 2006 22:10:36 +0000
Subject: [PATCH] (_hx509_pbe_decrypt): also try the empty password

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16841 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/crypto.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c
index 3cbe01909..d610b82b0 100644
--- a/lib/hx509/crypto.c
+++ b/lib/hx509/crypto.c
@@ -1462,10 +1462,16 @@ _hx509_pbe_decrypt(hx509_context context,
     pw = _hx509_lock_get_passwords(lock);
 
     ret = HX509_CRYPTO_INTERNAL_ERROR;
-    for (i = 0; i < pw->len; i++) {
+    for (i = 0; i < pw->len + 1; i++) {
 	hx509_crypto crypto;
+	const char *password;
 
-	ret = (*s2k)(context, pw->val[i], ai->parameters, &crypto, 
+	if (i < pw->len)
+	    password = pw->val[i];
+	else
+	    password = "";
+
+	ret = (*s2k)(context, password, ai->parameters, &crypto, 
 		     &key, &iv, enc_oid, md);
 	if (ret) {
 	    goto out;