diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/a_strnid.c')
-rw-r--r-- | src/lib/libcrypto/asn1/a_strnid.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c index f325d91924..0585f7050b 100644 --- a/src/lib/libcrypto/asn1/a_strnid.c +++ b/src/lib/libcrypto/asn1/a_strnid.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_strnid.c,v 1.20 2017/01/21 04:31:25 jsing Exp $ */ | 1 | /* $OpenBSD: a_strnid.c,v 1.21 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -258,14 +258,13 @@ ASN1_STRING_TABLE_add(int nid, long minsize, long maxsize, unsigned long mask, | |||
258 | if (!stable) | 258 | if (!stable) |
259 | stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp); | 259 | stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp); |
260 | if (!stable) { | 260 | if (!stable) { |
261 | ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE); | 261 | ASN1error(ERR_R_MALLOC_FAILURE); |
262 | return 0; | 262 | return 0; |
263 | } | 263 | } |
264 | if (!(tmp = ASN1_STRING_TABLE_get(nid))) { | 264 | if (!(tmp = ASN1_STRING_TABLE_get(nid))) { |
265 | tmp = malloc(sizeof(ASN1_STRING_TABLE)); | 265 | tmp = malloc(sizeof(ASN1_STRING_TABLE)); |
266 | if (!tmp) { | 266 | if (!tmp) { |
267 | ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, | 267 | ASN1error(ERR_R_MALLOC_FAILURE); |
268 | ERR_R_MALLOC_FAILURE); | ||
269 | return 0; | 268 | return 0; |
270 | } | 269 | } |
271 | tmp->flags = flags | STABLE_FLAGS_MALLOC; | 270 | tmp->flags = flags | STABLE_FLAGS_MALLOC; |
@@ -280,8 +279,7 @@ ASN1_STRING_TABLE_add(int nid, long minsize, long maxsize, unsigned long mask, | |||
280 | if (new_nid) { | 279 | if (new_nid) { |
281 | if (sk_ASN1_STRING_TABLE_push(stable, tmp) == 0) { | 280 | if (sk_ASN1_STRING_TABLE_push(stable, tmp) == 0) { |
282 | free(tmp); | 281 | free(tmp); |
283 | ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, | 282 | ASN1error(ERR_R_MALLOC_FAILURE); |
284 | ERR_R_MALLOC_FAILURE); | ||
285 | return 0; | 283 | return 0; |
286 | } | 284 | } |
287 | } | 285 | } |