diff options
author | beck <> | 2002-05-15 02:29:21 +0000 |
---|---|---|
committer | beck <> | 2002-05-15 02:29:21 +0000 |
commit | b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 (patch) | |
tree | fa27cf82a1250b64ed3bf5f4a18c7354d470bbcc /src/lib/libcrypto/pkcs12/p12_init.c | |
parent | e471e1ea98d673597b182ea85f29e30c97cd08b5 (diff) | |
download | openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.gz openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.bz2 openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.zip |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_init.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_init.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c index d5d4884c82..eb837a78cf 100644 --- a/src/lib/libcrypto/pkcs12/p12_init.c +++ b/src/lib/libcrypto/pkcs12/p12_init.c | |||
@@ -69,15 +69,7 @@ PKCS12 *PKCS12_init (int mode) | |||
69 | PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); | 69 | PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); |
70 | return NULL; | 70 | return NULL; |
71 | } | 71 | } |
72 | if (!(pkcs12->version = M_ASN1_INTEGER_new ())) { | ||
73 | PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); | ||
74 | return NULL; | ||
75 | } | ||
76 | ASN1_INTEGER_set(pkcs12->version, 3); | 72 | ASN1_INTEGER_set(pkcs12->version, 3); |
77 | if (!(pkcs12->authsafes = PKCS7_new())) { | ||
78 | PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); | ||
79 | return NULL; | ||
80 | } | ||
81 | pkcs12->authsafes->type = OBJ_nid2obj(mode); | 73 | pkcs12->authsafes->type = OBJ_nid2obj(mode); |
82 | switch (mode) { | 74 | switch (mode) { |
83 | case NID_pkcs7_data: | 75 | case NID_pkcs7_data: |