summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2024-10-11 11:58:53 +0000
committerjsing <>2024-10-11 11:58:53 +0000
commitbcdebcee92aa7480032512ae8141bae6467456cf (patch)
treed2a5dc35a0f5475bb3d88d13b5125b2db164394b /src
parentdfaf47c51a7fa1f113185ca620cb5c7e29183a37 (diff)
downloadopenbsd-bcdebcee92aa7480032512ae8141bae6467456cf.tar.gz
openbsd-bcdebcee92aa7480032512ae8141bae6467456cf.tar.bz2
openbsd-bcdebcee92aa7480032512ae8141bae6467456cf.zip
Add ERR_LIB_SYS to the error values in ERR_str_functs[].
This is currently added via err_load_strings(), which means ERR_str_functs[] cannot be made const. Adding ERR_LIB_SYS means the fixup becomes unnecessary. ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/err/err.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index f0001cd885..4342efbdab 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.c,v 1.65 2024/10/02 15:21:39 jsing Exp $ */ 1/* $OpenBSD: err.c,v 1.66 2024/10/11 11:58:53 jsing 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 *
@@ -175,16 +175,16 @@ static ERR_STRING_DATA ERR_str_libraries[] = {
175}; 175};
176 176
177static ERR_STRING_DATA ERR_str_functs[] = { 177static ERR_STRING_DATA ERR_str_functs[] = {
178 {ERR_PACK(0,SYS_F_FOPEN, 0), "fopen"}, 178 {ERR_PACK(ERR_LIB_SYS,SYS_F_FOPEN, 0), "fopen"},
179 {ERR_PACK(0,SYS_F_CONNECT, 0), "connect"}, 179 {ERR_PACK(ERR_LIB_SYS,SYS_F_CONNECT, 0), "connect"},
180 {ERR_PACK(0,SYS_F_GETSERVBYNAME, 0), "getservbyname"}, 180 {ERR_PACK(ERR_LIB_SYS,SYS_F_GETSERVBYNAME, 0), "getservbyname"},
181 {ERR_PACK(0,SYS_F_SOCKET, 0), "socket"}, 181 {ERR_PACK(ERR_LIB_SYS,SYS_F_SOCKET, 0), "socket"},
182 {ERR_PACK(0,SYS_F_IOCTLSOCKET, 0), "ioctl"}, 182 {ERR_PACK(ERR_LIB_SYS,SYS_F_IOCTLSOCKET, 0), "ioctl"},
183 {ERR_PACK(0,SYS_F_BIND, 0), "bind"}, 183 {ERR_PACK(ERR_LIB_SYS,SYS_F_BIND, 0), "bind"},
184 {ERR_PACK(0,SYS_F_LISTEN, 0), "listen"}, 184 {ERR_PACK(ERR_LIB_SYS,SYS_F_LISTEN, 0), "listen"},
185 {ERR_PACK(0,SYS_F_ACCEPT, 0), "accept"}, 185 {ERR_PACK(ERR_LIB_SYS,SYS_F_ACCEPT, 0), "accept"},
186 {ERR_PACK(0,SYS_F_OPENDIR, 0), "opendir"}, 186 {ERR_PACK(ERR_LIB_SYS,SYS_F_OPENDIR, 0), "opendir"},
187 {ERR_PACK(0,SYS_F_FREAD, 0), "fread"}, 187 {ERR_PACK(ERR_LIB_SYS,SYS_F_FREAD, 0), "fread"},
188 {0, NULL}, 188 {0, NULL},
189}; 189};
190 190
@@ -690,7 +690,7 @@ ERR_load_ERR_strings_internal(void)
690#ifndef OPENSSL_NO_ERR 690#ifndef OPENSSL_NO_ERR
691 err_load_strings(0, ERR_str_libraries); 691 err_load_strings(0, ERR_str_libraries);
692 err_load_strings(0, ERR_str_reasons); 692 err_load_strings(0, ERR_str_reasons);
693 err_load_strings(ERR_LIB_SYS, ERR_str_functs); 693 err_load_strings(0, ERR_str_functs);
694 build_SYS_str_reasons(); 694 build_SYS_str_reasons();
695 err_load_strings(ERR_LIB_SYS, SYS_str_reasons); 695 err_load_strings(ERR_LIB_SYS, SYS_str_reasons);
696#endif 696#endif