aboutsummaryrefslogtreecommitdiffstats
path: root/apps/pkcs8.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-12-31 01:13:04 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-12-31 01:13:04 +0000
commitecbe07817ab8fff2aca97eeb69fabdd5c54b4bda (patch)
tree71a101c30b45069272befb805c9b285059a4cd4b /apps/pkcs8.c
parent71db02813c8d1ac2901be397ee4aa5f4dceabb17 (diff)
downloadopenssl-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 'apps/pkcs8.c')
-rw-r--r--apps/pkcs8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index bd1697a325..3633590874 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -325,7 +325,7 @@ int MAIN(int argc, char **argv)
p8pass = pass;
EVP_read_pw_string(pass, 50, "Enter Password:", 0);
}
- p8inf = M_PKCS8_decrypt(p8, p8pass, strlen(p8pass));
+ p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
X509_SIG_free(p8);
}