1 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c
index f559351d18..f1a210b5d2 100644
--- a/src/lib/libcrypto/pkcs12/p12_attr.c
+++ b/src/lib/libcrypto/pkcs12/p12_attr.c
@@ -87,13 +87,13 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
                 return 0;
         }
         attrib->object = OBJ_nid2obj(NID_localKeyID);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
+        if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
         sk_ASN1_TYPE_push (attrib->value.set,keyid);
         attrib->set = 1;
-        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
+        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
@@ -129,14 +129,14 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
                 return 0;
         }
         attrib->object = OBJ_nid2obj(NID_key_usage);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
+        if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                 PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
         sk_ASN1_TYPE_push (attrib->value.set,keyid);
         attrib->set = 1;
         if (!p8->attributes
-            && !(p8->attributes = sk_X509_ATTRIBUTE_new (NULL))) {
+            && !(p8->attributes = sk_X509_ATTRIBUTE_new_null ())) {
                 PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                 return 0;
         }
@@ -157,7 +157,7 @@ int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, const char *name,
                 return 0;
         }
         ret = PKCS12_add_friendlyname_uni (bag, uniname, unilen);
-        Free(uniname);
+        OPENSSL_free(uniname);
         return ret;
 }
         
@@ -181,7 +181,7 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
                                                         ERR_R_MALLOC_FAILURE);
                 return 0;
         }
-        if (!(bmp->data = Malloc (namelen))) {
+        if (!(bmp->data = OPENSSL_malloc (namelen))) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
                                                         ERR_R_MALLOC_FAILURE);
                 return 0;
@@ -195,14 +195,14 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
                 return 0;
         }
         attrib->object = OBJ_nid2obj(NID_friendlyName);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
+        if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME,
                                                         ERR_R_MALLOC_FAILURE);
                 return 0;
         }
         sk_ASN1_TYPE_push (attrib->value.set,fname);
         attrib->set = 1;
-        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
+        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) {
                 PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
                                                         ERR_R_MALLOC_FAILURE);
                 return 0;