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/asn_moid.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/asn_moid.c')
-rw-r--r-- | src/lib/libcrypto/asn1/asn_moid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/asn_moid.c b/src/lib/libcrypto/asn1/asn_moid.c index 76b6405212..7bf493e288 100644 --- a/src/lib/libcrypto/asn1/asn_moid.c +++ b/src/lib/libcrypto/asn1/asn_moid.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn_moid.c,v 1.12 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: asn_moid.c,v 1.13 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -79,13 +79,13 @@ oid_module_init(CONF_IMODULE *md, const CONF *cnf) | |||
79 | 79 | ||
80 | oid_section = CONF_imodule_get_value(md); | 80 | oid_section = CONF_imodule_get_value(md); |
81 | if (!(sktmp = NCONF_get_section(cnf, oid_section))) { | 81 | if (!(sktmp = NCONF_get_section(cnf, oid_section))) { |
82 | ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION); | 82 | ASN1error(ASN1_R_ERROR_LOADING_SECTION); |
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) { | 85 | for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) { |
86 | oval = sk_CONF_VALUE_value(sktmp, i); | 86 | oval = sk_CONF_VALUE_value(sktmp, i); |
87 | if (!do_create(oval->value, oval->name)) { | 87 | if (!do_create(oval->value, oval->name)) { |
88 | ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT); | 88 | ASN1error(ASN1_R_ADDING_OBJECT); |
89 | return 0; | 89 | return 0; |
90 | } | 90 | } |
91 | } | 91 | } |