Replace the macros in asn1.h with function equivalents. Also make UTF8Strings

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

diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index dc6ab41db88a93b77e143a465c45e9e829aca682..d5d4884c82018d264bf38c4e6bddd4b107bd2320 100644 (file)
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -69,11 +69,11 @@ PKCS12 *PKCS12_init (int mode)
                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       if (!(pkcs12->version = ASN1_INTEGER_new ())) {
+       if (!(pkcs12->version = M_ASN1_INTEGER_new ())) {
                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       ASN1_INTEGER_set (pkcs12->version, 3);
+       ASN1_INTEGER_set(pkcs12->version, 3);
        if (!(pkcs12->authsafes = PKCS7_new())) {
                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
                return NULL;
@@ -82,7 +82,7 @@ PKCS12 *PKCS12_init (int 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;
                }