X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fpkcs12%2Fp12_crt.c;h=4c36c643ce683b2222126255c637c6066c52a791;hb=ecbe07817ab8fff2aca97eeb69fabdd5c54b4bda;hp=a8f7b48882b5153c5fd30cc3561ab2c1b44cd0e1;hpb=71db02813c8d1ac2901be397ee4aa5f4dceabb17;p=openssl.git

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index a8f7b48882..4c36c643ce 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -94,7 +94,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 	}
 
 	/* Add user certificate */
-	if(!(bag = M_PKCS12_x5092certbag(cert))) return NULL;
+	if(!(bag = PKCS12_x5092certbag(cert))) return NULL;
 	if(name && !PKCS12_add_friendlyname(bag, name, -1)) return NULL;
 	X509_digest(cert, EVP_sha1(), keyid, &keyidlen);
 	if(!PKCS12_add_localkeyid(bag, keyid, keyidlen)) return NULL;
@@ -108,7 +108,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 	if(ca) {
 		for(i = 0; i < sk_X509_num(ca); i++) {
 			tcert = sk_X509_value(ca, i);
-			if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL;
+			if(!(bag = PKCS12_x5092certbag(tcert))) return NULL;
 			if(!sk_PKCS12_SAFEBAG_push(bags, bag)) {
 				PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
 				return NULL;
@@ -152,7 +152,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 
 	if(!(p12 = PKCS12_init (NID_pkcs7_data))) return NULL;
 
-	if(!M_PKCS12_pack_authsafes (p12, safes)) return NULL;
+	if(!PKCS12_pack_authsafes (p12, safes)) return NULL;
 
 	sk_PKCS7_pop_free(safes, PKCS7_free);