From 41ce53a16e045482edcf07c652bb6aacdef71ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 13 Jan 2006 08:44:57 +0000
Subject: [PATCH] (PBE_string2key): libdes now supports PKCS12_key_gen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16544 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/crypto.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c
index d68db40bb..a624450e7 100644
--- a/lib/hx509/crypto.c
+++ b/lib/hx509/crypto.c
@@ -1328,7 +1328,6 @@ PBE_string2key(hx509_context context,
 	       const heim_oid *enc_oid,
 	       const EVP_MD *md)
 {
-#ifdef HAVE_OPENSSL
     PKCS12_PBEParams p12params;
     int passwordlen = strlen(password);
     hx509_crypto c;
@@ -1381,9 +1380,6 @@ PBE_string2key(hx509_context context,
 out:
     free_PKCS12_PBEParams(&p12params);
     return ret;
-#else
-    return HX509_CRYPTO_INTERNAL_ERROR;
-#endif
 }
 
 static const heim_oid *
@@ -1481,7 +1477,7 @@ _hx509_pbe_decrypt(hx509_context context,
 	    goto out;
 				   
     }
- out:
+out:
     if (key.data)
 	free_octet_string(&key);
     if (iv.data)