diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_name.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_name.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c index 64baf5719d..b832deb928 100644 --- a/src/lib/libcrypto/asn1/x_name.c +++ b/src/lib/libcrypto/asn1/x_name.c | |||
@@ -217,7 +217,7 @@ X509_NAME *X509_NAME_new(void) | |||
217 | ASN1_CTX c; | 217 | ASN1_CTX c; |
218 | 218 | ||
219 | M_ASN1_New_Malloc(ret,X509_NAME); | 219 | M_ASN1_New_Malloc(ret,X509_NAME); |
220 | if ((ret->entries=sk_X509_NAME_ENTRY_new(NULL)) == NULL) | 220 | if ((ret->entries=sk_X509_NAME_ENTRY_new_null()) == NULL) |
221 | { c.line=__LINE__; goto err2; } | 221 | { c.line=__LINE__; goto err2; } |
222 | M_ASN1_New(ret->bytes,BUF_MEM_new); | 222 | M_ASN1_New(ret->bytes,BUF_MEM_new); |
223 | ret->modified=1; | 223 | ret->modified=1; |
@@ -246,7 +246,7 @@ void X509_NAME_free(X509_NAME *a) | |||
246 | 246 | ||
247 | BUF_MEM_free(a->bytes); | 247 | BUF_MEM_free(a->bytes); |
248 | sk_X509_NAME_ENTRY_pop_free(a->entries,X509_NAME_ENTRY_free); | 248 | sk_X509_NAME_ENTRY_pop_free(a->entries,X509_NAME_ENTRY_free); |
249 | Free(a); | 249 | OPENSSL_free(a); |
250 | } | 250 | } |
251 | 251 | ||
252 | void X509_NAME_ENTRY_free(X509_NAME_ENTRY *a) | 252 | void X509_NAME_ENTRY_free(X509_NAME_ENTRY *a) |
@@ -254,7 +254,7 @@ void X509_NAME_ENTRY_free(X509_NAME_ENTRY *a) | |||
254 | if (a == NULL) return; | 254 | if (a == NULL) return; |
255 | ASN1_OBJECT_free(a->object); | 255 | ASN1_OBJECT_free(a->object); |
256 | M_ASN1_BIT_STRING_free(a->value); | 256 | M_ASN1_BIT_STRING_free(a->value); |
257 | Free(a); | 257 | OPENSSL_free(a); |
258 | } | 258 | } |
259 | 259 | ||
260 | int X509_NAME_set(X509_NAME **xn, X509_NAME *name) | 260 | int X509_NAME_set(X509_NAME **xn, X509_NAME *name) |