make update

[openssl.git] / crypto / pkcs12 / p12_init.c

diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 5301bd63f0213ef2fa6fb6accd8bf0a31971d222..eb837a78cf7d1519bff74e5e0a7afe620c556666 100644 (file)
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
 
 /* Initialise a PKCS12 structure to take data */
 
@@ -69,20 +69,12 @@ PKCS12 *PKCS12_init (int mode)
                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       if (!(pkcs12->version = ASN1_INTEGER_new ())) {
-               PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-               return NULL;
-       }
-       ASN1_INTEGER_set (pkcs12->version, 3);
-       if (!(pkcs12->authsafes = PKCS7_new())) {
-               PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-               return NULL;
-       }
+       ASN1_INTEGER_set(pkcs12->version, 3);
        pkcs12->authsafes->type = OBJ_nid2obj(mode);
        switch (mode) {
                case NID_pkcs7_data:
                        if (!(pkcs12->authsafes->d.data =
-                                ASN1_OCTET_STRING_new())) {
+                                M_ASN1_OCTET_STRING_new())) {
                        PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                        return NULL;
                }