diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/asn1/a_dup.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/asn1/a_dup.c')
-rw-r--r-- | src/lib/libcrypto/asn1/a_dup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/a_dup.c b/src/lib/libcrypto/asn1/a_dup.c index 79cd1d4586..2e17a1e219 100644 --- a/src/lib/libcrypto/asn1/a_dup.c +++ b/src/lib/libcrypto/asn1/a_dup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_dup.c,v 1.13 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: a_dup.c,v 1.14 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -77,7 +77,7 @@ ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) | |||
77 | i = i2d(x, NULL); | 77 | i = i2d(x, NULL); |
78 | b = malloc(i + 10); | 78 | b = malloc(i + 10); |
79 | if (b == NULL) { | 79 | if (b == NULL) { |
80 | ASN1err(ASN1_F_ASN1_DUP, ERR_R_MALLOC_FAILURE); | 80 | ASN1error(ERR_R_MALLOC_FAILURE); |
81 | return (NULL); | 81 | return (NULL); |
82 | } | 82 | } |
83 | p = b; | 83 | p = b; |
@@ -108,7 +108,7 @@ ASN1_item_dup(const ASN1_ITEM *it, void *x) | |||
108 | 108 | ||
109 | i = ASN1_item_i2d(x, &b, it); | 109 | i = ASN1_item_i2d(x, &b, it); |
110 | if (b == NULL) { | 110 | if (b == NULL) { |
111 | ASN1err(ASN1_F_ASN1_ITEM_DUP, ERR_R_MALLOC_FAILURE); | 111 | ASN1error(ERR_R_MALLOC_FAILURE); |
112 | return (NULL); | 112 | return (NULL); |
113 | } | 113 | } |
114 | p = b; | 114 | p = b; |