summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/conf/conf_err.c
diff options
context:
space:
mode:
authorbeck <>2017-01-29 17:49:23 +0000
committerbeck <>2017-01-29 17:49:23 +0000
commit957b11334a7afb14537322f0e4795b2e368b3f59 (patch)
tree1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/conf/conf_err.c
parentdf96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff)
downloadopenbsd-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/conf/conf_err.c')
-rw-r--r--src/lib/libcrypto/conf/conf_err.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c
index a1a7cbe42e..dbb373ae85 100644
--- a/src/lib/libcrypto/conf/conf_err.c
+++ b/src/lib/libcrypto/conf/conf_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_err.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ 1/* $OpenBSD: conf_err.c,v 1.13 2017/01/29 17:49:22 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -72,28 +72,7 @@
72#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason) 72#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason)
73 73
74static ERR_STRING_DATA CONF_str_functs[]= { 74static ERR_STRING_DATA CONF_str_functs[]= {
75 {ERR_FUNC(CONF_F_CONF_DUMP_FP), "CONF_dump_fp"}, 75 {ERR_FUNC(0xfff), "CRYPTO_internal"},
76 {ERR_FUNC(CONF_F_CONF_LOAD), "CONF_load"},
77 {ERR_FUNC(CONF_F_CONF_LOAD_BIO), "CONF_load_bio"},
78 {ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"},
79 {ERR_FUNC(CONF_F_CONF_MODULES_LOAD), "CONF_modules_load"},
80 {ERR_FUNC(CONF_F_CONF_PARSE_LIST), "CONF_parse_list"},
81 {ERR_FUNC(CONF_F_DEF_LOAD), "DEF_LOAD"},
82 {ERR_FUNC(CONF_F_DEF_LOAD_BIO), "DEF_LOAD_BIO"},
83 {ERR_FUNC(CONF_F_MODULE_INIT), "MODULE_INIT"},
84 {ERR_FUNC(CONF_F_MODULE_LOAD_DSO), "MODULE_LOAD_DSO"},
85 {ERR_FUNC(CONF_F_MODULE_RUN), "MODULE_RUN"},
86 {ERR_FUNC(CONF_F_NCONF_DUMP_BIO), "NCONF_dump_bio"},
87 {ERR_FUNC(CONF_F_NCONF_DUMP_FP), "NCONF_dump_fp"},
88 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER), "NCONF_get_number"},
89 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER_E), "NCONF_get_number_e"},
90 {ERR_FUNC(CONF_F_NCONF_GET_SECTION), "NCONF_get_section"},
91 {ERR_FUNC(CONF_F_NCONF_GET_STRING), "NCONF_get_string"},
92 {ERR_FUNC(CONF_F_NCONF_LOAD), "NCONF_load"},
93 {ERR_FUNC(CONF_F_NCONF_LOAD_BIO), "NCONF_load_bio"},
94 {ERR_FUNC(CONF_F_NCONF_LOAD_FP), "NCONF_load_fp"},
95 {ERR_FUNC(CONF_F_NCONF_NEW), "NCONF_new"},
96 {ERR_FUNC(CONF_F_STR_COPY), "STR_COPY"},
97 {0, NULL} 76 {0, NULL}
98}; 77};
99 78