diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-12-31 01:13:04 +0000 |
| commit | ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda (patch) | |
| tree | 71a101c30b45069272befb805c9b285059a4cd4b /crypto/pem/pem_lib.c | |
| parent | 71db02813c8d1ac2901be397ee4aa5f4dceabb17 (diff) | |
| download | openssl-ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda.tar.gz | |
Rewrite PKCS#12 code and remove some of the old
horrible macros.
Fix two evil ASN1 bugs. Attempt to use 'ctx' when
NULL if input is indefinite length constructed
in asn1_check_tlen() and invalid pointer to ASN1_TYPE
when reusing existing structure (this took *ages* to
find because the new PKCS#12 code triggered it).
Diffstat (limited to 'crypto/pem/pem_lib.c')
| -rw-r--r-- | crypto/pem/pem_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index a17c3ed57f..5d105242ac 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -274,7 +274,7 @@ char *PEM_ASN1_read_bio(char *(*d2i)(), const char *name, BIO *bp, char **x, PEM_R_BAD_PASSWORD_READ); goto err; } - p8inf = M_PKCS8_decrypt(p8, psbuf, klen); + p8inf = PKCS8_decrypt(p8, psbuf, klen); X509_SIG_free(p8); if(!p8inf) goto p8err; ret = (char *)EVP_PKCS82PKEY(p8inf); @@ -890,7 +890,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo X509_SIG_free(p8); return NULL; } - p8inf = M_PKCS8_decrypt(p8, psbuf, klen); + p8inf = PKCS8_decrypt(p8, psbuf, klen); X509_SIG_free(p8); if(!p8inf) return NULL; ret = EVP_PKCS82PKEY(p8inf); |