diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_attr.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_attr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c index 31c9782b77..f559351d18 100644 --- a/src/lib/libcrypto/pkcs12/p12_attr.c +++ b/src/lib/libcrypto/pkcs12/p12_attr.c | |||
@@ -73,11 +73,11 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name, | |||
73 | return 0; | 73 | return 0; |
74 | } | 74 | } |
75 | keyid->type = V_ASN1_OCTET_STRING; | 75 | keyid->type = V_ASN1_OCTET_STRING; |
76 | if (!(oct = ASN1_OCTET_STRING_new())) { | 76 | if (!(oct = M_ASN1_OCTET_STRING_new())) { |
77 | PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); | 77 | PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); |
78 | return 0; | 78 | return 0; |
79 | } | 79 | } |
80 | if (!ASN1_OCTET_STRING_set(oct, name, namelen)) { | 80 | if (!M_ASN1_OCTET_STRING_set(oct, name, namelen)) { |
81 | PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); | 81 | PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE); |
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
@@ -115,11 +115,11 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage) | |||
115 | return 0; | 115 | return 0; |
116 | } | 116 | } |
117 | keyid->type = V_ASN1_BIT_STRING; | 117 | keyid->type = V_ASN1_BIT_STRING; |
118 | if (!(bstr = ASN1_BIT_STRING_new())) { | 118 | if (!(bstr = M_ASN1_BIT_STRING_new())) { |
119 | PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); | 119 | PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); |
120 | return 0; | 120 | return 0; |
121 | } | 121 | } |
122 | if (!ASN1_BIT_STRING_set(bstr, &us_val, 1)) { | 122 | if (!M_ASN1_BIT_STRING_set(bstr, &us_val, 1)) { |
123 | PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); | 123 | PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE); |
124 | return 0; | 124 | return 0; |
125 | } | 125 | } |
@@ -176,7 +176,7 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag, | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | fname->type = V_ASN1_BMPSTRING; | 178 | fname->type = V_ASN1_BMPSTRING; |
179 | if (!(bmp = ASN1_BMPSTRING_new())) { | 179 | if (!(bmp = M_ASN1_BMPSTRING_new())) { |
180 | PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI, | 180 | PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI, |
181 | ERR_R_MALLOC_FAILURE); | 181 | ERR_R_MALLOC_FAILURE); |
182 | return 0; | 182 | return 0; |