oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(PBE_string2key): libdes now supports PKCS12_key_gen

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16544 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-13 08:44:57 +00:00
parent bac884b9e6
commit 41ce53a16e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hx509/crypto.c
View File

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