(PBE_string2key): libdes now supports PKCS12_key_gen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16544 ec53bebd-3082-4978-b11e-865c3cabbd6b
2006-01-13 08:44:57 +00:00
parent bac884b9e6
commit 41ce53a16e
1 changed files with 1 additions and 5 deletions
--- 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 *