The branch master has been updated via a80278b071426c7262c07d3b29100573b94df16d (commit) via 46160e6fb957a3f4141c13cba75d03c05b240968 (commit) via 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (commit) from 1372560f64c9a7cfad1979fa8c41bee335a04373 (commit)
- Log ----------------------------------------------------------------- commit a80278b071426c7262c07d3b29100573b94df16d Author: Rich Salz <rs...@akamai.com> Date: Tue Jul 16 19:55:44 2019 -0400 Include deprecated SYS_F_xxx codes Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9072) commit 46160e6fb957a3f4141c13cba75d03c05b240968 Author: Rich Salz <rs...@akamai.com> Date: Tue Jul 16 12:54:24 2019 -0400 Deprecate SYSerr, add new FUNCerr macro Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9072) commit 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 Author: Rich Salz <rs...@akamai.com> Date: Tue Jun 11 15:42:42 2019 -0400 Add ERR_put_func_error, and use it. Change SYSerr to have the function name; remove SYS_F_xxx defines Add a test and documentation. Use get_last_socket_err, which removes some ifdef's in OpenSSL code. Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9072) ----------------------------------------------------------------------- Summary of changes: CHANGES | 4 +++ apps/apps.c | 4 +-- crypto/bio/b_addr.c | 16 +++++------ crypto/bio/b_sock.c | 15 +++++------ crypto/bio/b_sock2.c | 24 ++++++++--------- crypto/bio/bss_acpt.c | 2 +- crypto/bio/bss_conn.c | 6 ++--- crypto/bio/bss_file.c | 8 +++--- crypto/conf/conf_def.c | 2 +- crypto/err/err.c | 7 +++++ crypto/err/openssl.ec | 1 + crypto/store/loader_file.c | 2 +- doc/man3/ERR_put_error.pod | 9 ++++++- engines/e_devcrypto.c | 16 +++++------ include/openssl/err.h | 66 ++++++++++++++++++++++++++-------------------- ssl/ssl_cert.c | 2 +- ssl/ssl_lib.c | 2 +- test/errtest.c | 19 +++++++++++++ util/libcrypto.num | 1 + 19 files changed, 123 insertions(+), 83 deletions(-) diff --git a/CHANGES b/CHANGES index 6b9e7c4..e517ace 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,10 @@ Changes between 1.1.1 and 3.0.0 [xx XXX xxxx] + *) Added a new FUNCerr() macro that takes a function name. + The macro SYSerr() is deprecated. + [Rich Salz] + *) {CRYPTO,OPENSSL}_mem_debug_{push,pop} are now no-ops and have been deprecated. [Rich Salz] diff --git a/apps/apps.c b/apps/apps.c index 8921c18..43af5ad 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1388,8 +1388,8 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr) #ifndef OPENSSL_NO_POSIX_IO BIO_get_fp(in, &dbfp); if (fstat(fileno(dbfp), &dbst) == -1) { - SYSerr(SYS_F_FSTAT, errno); - ERR_add_error_data(3, "fstat('", dbfile, "')"); + FUNCerr("fstat", errno); + ERR_add_error_data(1, dbfile); ERR_print_errors(bio_err); goto err; } diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index d7fcf2f..e2354e3 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -207,7 +207,7 @@ static int addr_strings(const BIO_ADDR *ap, int numeric, flags)) != 0) { # ifdef EAI_SYSTEM if (ret == EAI_SYSTEM) { - SYSerr(SYS_F_GETNAMEINFO, get_last_socket_error()); + FUNCerr("getnameinfo", get_last_socket_error()); BIOerr(BIO_F_ADDR_STRINGS, ERR_R_SYS_LIB); } else # endif @@ -700,7 +700,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, switch ((gai_ret = getaddrinfo(host, service, &hints, res))) { # ifdef EAI_SYSTEM case EAI_SYSTEM: - SYSerr(SYS_F_GETADDRINFO, get_last_socket_error()); + FUNCerr("getaddrinfo", get_last_socket_error()); BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB); break; # endif @@ -804,12 +804,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, */ # if defined(OPENSSL_SYS_VXWORKS) /* h_errno doesn't exist on VxWorks */ - SYSerr(SYS_F_GETHOSTBYNAME, 1000 ); + FUNCerr("gethostbyname", 1000 ); # else - SYSerr(SYS_F_GETHOSTBYNAME, 1000 + h_errno); + FUNCerr("gethostbyname", 1000 + h_errno); # endif #else - SYSerr(SYS_F_GETHOSTBYNAME, WSAGetLastError()); + FUNCerr("gethostbyname", get_last_socket_error()); #endif ret = 0; goto err; @@ -855,11 +855,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, se = getservbyname(service, proto); if (se == NULL) { -#ifndef OPENSSL_SYS_WINDOWS - SYSerr(SYS_F_GETSERVBYNAME, errno); -#else - SYSerr(SYS_F_GETSERVBYNAME, WSAGetLastError()); -#endif + FUNCerr("getservbyname", get_last_socket_error()); goto err; } } else { diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 9877b3d..46a2ff7 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -120,8 +120,6 @@ int BIO_sock_init(void) static struct WSAData wsa_state; if (!wsa_init_done) { - int err; - wsa_init_done = 1; memset(&wsa_state, 0, sizeof(wsa_state)); /* @@ -131,8 +129,7 @@ int BIO_sock_init(void) * probed at run-time with DSO_global_lookup. */ if (WSAStartup(0x0202, &wsa_state) != 0) { - err = WSAGetLastError(); - SYSerr(SYS_F_WSASTARTUP, err); + FUNCerr("wsastartup", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INIT, BIO_R_WSASTARTUP); return -1; } @@ -192,7 +189,7 @@ int BIO_socket_ioctl(int fd, long type, void *arg) i = ioctlsocket(fd, type, ARG); # endif /* __DJGPP__ */ if (i < 0) - SYSerr(SYS_F_IOCTLSOCKET, get_last_socket_error()); + FUNCerr("ioctlsocket", get_last_socket_error()); return i; } @@ -243,7 +240,7 @@ int BIO_accept(int sock, char **ip_port) ret = -2; goto end; } - SYSerr(SYS_F_ACCEPT, get_last_socket_error()); + FUNCerr("accept", get_last_socket_error()); BIOerr(BIO_F_BIO_ACCEPT, BIO_R_ACCEPT_ERROR); goto end; } @@ -308,7 +305,7 @@ int BIO_socket_nbio(int s, int mode) l = fcntl(s, F_GETFL, 0); if (l == -1) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + FUNCerr("fcntl", get_last_sys_error()); ret = -1; } else { # if defined(O_NONBLOCK) @@ -326,7 +323,7 @@ int BIO_socket_nbio(int s, int mode) ret = fcntl(s, F_SETFL, l); if (ret < 0) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + FUNCerr("fcntl", get_last_sys_error()); } } # else @@ -349,7 +346,7 @@ int BIO_sock_info(int sock, ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr), &addr_len); if (ret == -1) { - SYSerr(SYS_F_GETSOCKNAME, get_last_socket_error()); + FUNCerr("getsockname", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INFO, BIO_R_GETSOCKNAME_ERROR); return 0; } diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c index 7e04d78..ee26951 100644 --- a/crypto/bio/b_sock2.c +++ b/crypto/bio/b_sock2.c @@ -46,7 +46,7 @@ int BIO_socket(int domain, int socktype, int protocol, int options) sock = socket(domain, socktype, protocol); if (sock == -1) { - SYSerr(SYS_F_SOCKET, get_last_socket_error()); + FUNCerr("socket", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); return INVALID_SOCKET; } @@ -89,7 +89,7 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options) if (options & BIO_SOCK_KEEPALIVE) { if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_CONNECT, BIO_R_UNABLE_TO_KEEPALIVE); return 0; } @@ -98,7 +98,7 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options) if (options & BIO_SOCK_NODELAY) { if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_CONNECT, BIO_R_UNABLE_TO_NODELAY); return 0; } @@ -107,7 +107,7 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options) if (connect(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) == -1) { if (!BIO_sock_should_retry(-1)) { - SYSerr(SYS_F_CONNECT, get_last_socket_error()); + FUNCerr("connect", get_last_socket_error()); BIOerr(BIO_F_BIO_CONNECT, BIO_R_CONNECT_ERROR); } return 0; @@ -150,7 +150,7 @@ int BIO_bind(int sock, const BIO_ADDR *addr, int options) if (options & BIO_SOCK_REUSEADDR) { if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_BIND, BIO_R_UNABLE_TO_REUSEADDR); return 0; } @@ -158,7 +158,7 @@ int BIO_bind(int sock, const BIO_ADDR *addr, int options) # endif if (bind(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) != 0) { - SYSerr(SYS_F_BIND, get_last_socket_error()); + FUNCerr("bind", get_last_socket_error()); BIOerr(BIO_F_BIO_BIND, BIO_R_UNABLE_TO_BIND_SOCKET); return 0; } @@ -217,7 +217,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) if (getsockopt(sock, SOL_SOCKET, SO_TYPE, (void *)&socktype, &socktype_len) != 0 || socktype_len != sizeof(socktype)) { - SYSerr(SYS_F_GETSOCKOPT, get_last_socket_error()); + FUNCerr("getsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_GETTING_SOCKTYPE); return 0; } @@ -228,7 +228,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) if (options & BIO_SOCK_KEEPALIVE) { if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_UNABLE_TO_KEEPALIVE); return 0; } @@ -237,7 +237,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) if (options & BIO_SOCK_NODELAY) { if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_UNABLE_TO_NODELAY); return 0; } @@ -252,7 +252,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) on = options & BIO_SOCK_V6_ONLY ? 1 : 0; if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const void *)&on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); + FUNCerr("setsockopt", get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_LISTEN_V6_ONLY); return 0; } @@ -263,7 +263,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) return 0; if (socktype != SOCK_DGRAM && listen(sock, MAX_LISTEN) == -1) { - SYSerr(SYS_F_LISTEN, get_last_socket_error()); + FUNCerr("listen", get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_UNABLE_TO_LISTEN_SOCKET); return 0; } @@ -290,7 +290,7 @@ int BIO_accept_ex(int accept_sock, BIO_ADDR *addr_, int options) BIO_ADDR_sockaddr_noconst(addr), &len); if (accepted_sock == -1) { if (!BIO_sock_should_retry(accepted_sock)) { - SYSerr(SYS_F_ACCEPT, get_last_socket_error()); + FUNCerr("accept", get_last_socket_error()); BIOerr(BIO_F_BIO_ACCEPT_EX, BIO_R_ACCEPT_ERROR); } return INVALID_SOCKET; diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 8955aa8..c47b750 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -226,7 +226,7 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c) BIO_ADDRINFO_socktype(c->addr_iter), BIO_ADDRINFO_protocol(c->addr_iter), 0); if (ret == (int)INVALID_SOCKET) { - SYSerr(SYS_F_SOCKET, get_last_socket_error()); + FUNCerr("socket", get_last_socket_error()); ERR_add_error_data(4, "hostname=", c->param_addr, " service=", c->param_serv); diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 818b2ee..330c64f 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -138,7 +138,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) BIO_ADDRINFO_socktype(c->addr_iter), BIO_ADDRINFO_protocol(c->addr_iter), 0); if (ret == (int)INVALID_SOCKET) { - SYSerr(SYS_F_SOCKET, get_last_socket_error()); + FUNCerr("socket", get_last_socket_error()); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); @@ -170,7 +170,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) ERR_clear_error(); break; } else { - SYSerr(SYS_F_CONNECT, get_last_socket_error()); + FUNCerr("connect", get_last_socket_error()); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); @@ -186,7 +186,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) i = BIO_sock_error(b->num); if (i) { BIO_clear_retry_flags(b); - SYSerr(SYS_F_CONNECT, i); + FUNCerr("connect", i); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 0e07632..5a0b248 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -69,7 +69,7 @@ BIO *BIO_new_file(const char *filename, const char *mode) fp_flags |= BIO_FP_TEXT; if (file == NULL) { - SYSerr(SYS_F_FOPEN, get_last_sys_error()); + FUNCerr("fopen", get_last_sys_error()); ERR_add_error_data(5, "fopen('", filename, "','", mode, "')"); if (errno == ENOENT # ifdef ENXIO @@ -149,7 +149,7 @@ static int file_read(BIO *b, char *out, int outl) if (ret == 0 && (b->flags & BIO_FLAGS_UPLINK_INTERNAL ? UP_ferror((FILE *)b->ptr) : ferror((FILE *)b->ptr))) { - SYSerr(SYS_F_FREAD, get_last_sys_error()); + FUNCerr("fread", get_last_sys_error()); BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB); ret = -1; } @@ -288,7 +288,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) # endif fp = openssl_fopen(ptr, p); if (fp == NULL) { - SYSerr(SYS_F_FOPEN, get_last_sys_error()); + FUNCerr("fopen", get_last_sys_error()); ERR_add_error_data(5, "fopen('", ptr, "','", p, "')"); BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB); ret = 0; @@ -316,7 +316,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) st = b->flags & BIO_FLAGS_UPLINK_INTERNAL ? UP_fflush(b->ptr) : fflush((FILE *)b->ptr); if (st == EOF) { - SYSerr(SYS_F_FFLUSH, get_last_sys_error()); + FUNCerr("fflush", get_last_sys_error()); ERR_add_error_data(1, "fflush()"); BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB); ret = 0; diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 277e4d6..d6cd315 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -673,7 +673,7 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx, BIO *next; if (stat(include, &st) < 0) { - SYSerr(SYS_F_STAT, errno); + FUNCerr("stat", errno); ERR_add_error_data(1, include); /* missing include file is not fatal error */ return NULL; diff --git a/crypto/err/err.c b/crypto/err/err.c index c161dc2..71b1049 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -372,6 +372,13 @@ void err_free_strings_int(void) /********************************************************/ +void ERR_put_func_error(int lib, const char *func, int reason, + const char *file, int line) +{ + ERR_put_error(lib, 0, reason, file, line); + ERR_add_error_data(2, "calling function ", func); +} + void ERR_put_error(int lib, int func, int reason, const char *file, int line) { ERR_STATE *es; diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 04e76df..925ed65 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -3,6 +3,7 @@ # The INPUT HEADER is scanned for declarations # LIBNAME INPUT HEADER ERROR-TABLE FILE L ERR NONE NONE +L FUNC NONE NONE L BN include/openssl/bn.h crypto/bn/bn_err.c L RSA include/openssl/rsa.h crypto/rsa/rsa_err.c L DH include/openssl/dh.h crypto/dh/dh_err.c diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c index 5a70499..ab59fab 100644 --- a/crypto/store/loader_file.c +++ b/crypto/store/loader_file.c @@ -824,7 +824,7 @@ static OSSL_STORE_LOADER_CTX *file_open(const OSSL_STORE_LOADER *loader, } if (stat(path_data[i].path, &st) < 0) { - SYSerr(SYS_F_STAT, errno); + FUNCerr("stat", errno); ERR_add_error_data(1, path_data[i].path); } else { path = path_data[i].path; diff --git a/doc/man3/ERR_put_error.pod b/doc/man3/ERR_put_error.pod index 31a0e76..c2913d5 100644 --- a/doc/man3/ERR_put_error.pod +++ b/doc/man3/ERR_put_error.pod @@ -2,13 +2,16 @@ =head1 NAME -ERR_put_error, ERR_add_error_data, ERR_add_error_vdata - record an error +ERR_put_error, ERR_put_func_error, +ERR_add_error_data, ERR_add_error_vdata - record an error =head1 SYNOPSIS #include <openssl/err.h> void ERR_put_error(int lib, int func, int reason, const char *file, int line); + void ERR_put_func_error(int lib, const char *func, int reason, + const char *file, int line); void ERR_add_error_data(int num, ...); void ERR_add_error_vdata(int num, va_list arg); @@ -20,6 +23,10 @@ signals that the error of reason code B<reason> occurred in function B<func> of library B<lib>, in line number B<line> of B<file>. This function is usually called by a macro. +ERR_put_func_err() is similar except that the B<func> is a string naming +a function external to OpenSSL, usually provided by the platform on which +OpenSSL and the application is running. + ERR_add_error_data() associates the concatenation of its B<num> string arguments with the error code added last. ERR_add_error_vdata() is similar except the argument is a B<va_list>. diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c index f51b501..aa5c1a6 100644 --- a/engines/e_devcrypto.c +++ b/engines/e_devcrypto.c @@ -72,7 +72,7 @@ void engine_load_devcrypto_int(void); static int clean_devcrypto_session(struct session_op *sess) { if (ioctl(cfd, CIOCFSESSION, &sess->ses) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } memset(sess, 0, sizeof(struct session_op)); @@ -208,7 +208,7 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, cipher_ctx->mode = cipher_d->flags & EVP_CIPH_MODE; cipher_ctx->blocksize = cipher_d->blocksize; if (ioctl(cfd, CIOCGSESSION, &cipher_ctx->sess) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } @@ -260,7 +260,7 @@ static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, #endif if (ioctl(cfd, CIOCCRYPT, &cryp) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } @@ -704,7 +704,7 @@ static int digest_init(EVP_MD_CTX *ctx) memset(&digest_ctx->sess, 0, sizeof(digest_ctx->sess)); digest_ctx->sess.mac = digest_d->devcryptoid; if (ioctl(cfd, CIOCGSESSION, &digest_ctx->sess) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } return 1; @@ -743,7 +743,7 @@ static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) return 1; } - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } @@ -758,7 +758,7 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md) if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) { memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx)); } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } @@ -777,14 +777,14 @@ static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) return 1; if (!digest_init(to)) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } cphash.src_ses = digest_from->sess.ses; cphash.dst_ses = digest_to->sess.ses; if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) { - SYSerr(SYS_F_IOCTL, errno); + FUNCerr("ioctl", errno); return 0; } return 1; diff --git a/include/openssl/err.h b/include/openssl/err.h index 2e92b38..3fa30ab 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -26,9 +26,11 @@ extern "C" { #endif # ifndef OPENSSL_NO_ERR -# define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,d,e) +# define ERR_PUT_error(l,f,r,fn,ln) ERR_put_error(l,f,r,fn,ln) +# define ERR_PUT_func_error(l,f,r,fn,ln) ERR_put_func_error(l,f,r,fn,ln) # else -# define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) +# define ERR_PUT_error(l,f,r,fn,ln) ERR_put_error(l,f,r,NULL,0) +# define ERR_PUT_func_error(l,f,r,fn,ln) ERR_put_func_error(l,f,r,NULL,0) # endif # include <errno.h> @@ -103,7 +105,10 @@ typedef struct err_state_st { # define ERR_LIB_USER 128 -# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,0,(r),OPENSSL_FILE,OPENSSL_LINE) +# if ! OPENSSL_API_3 +# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,0,(r),OPENSSL_FILE,OPENSSL_LINE) +#endif +# define FUNCerr(f,r) ERR_PUT_func_error(ERR_LIB_SYS,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,0,(r),OPENSSL_FILE,OPENSSL_LINE) # define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,0,(r),OPENSSL_FILE,OPENSSL_LINE) # define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,0,(r),OPENSSL_FILE,OPENSSL_LINE) @@ -154,32 +159,33 @@ typedef struct err_state_st { # define ERR_GET_REASON(l) (int)( (l) & 0xFFFL) # define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL) -/* OS functions */ -# define SYS_F_FOPEN 1 -# define SYS_F_CONNECT 2 -# define SYS_F_GETSERVBYNAME 3 -# define SYS_F_SOCKET 4 -# define SYS_F_IOCTLSOCKET 5 -# define SYS_F_BIND 6 -# define SYS_F_LISTEN 7 -# define SYS_F_ACCEPT 8 -# define SYS_F_WSASTARTUP 9/* Winsock stuff */ -# define SYS_F_OPENDIR 10 -# define SYS_F_FREAD 11 -# define SYS_F_GETADDRINFO 12 -# define SYS_F_GETNAMEINFO 13 -# define SYS_F_SETSOCKOPT 14 -# define SYS_F_GETSOCKOPT 15 -# define SYS_F_GETSOCKNAME 16 -# define SYS_F_GETHOSTBYNAME 17 -# define SYS_F_FFLUSH 18 -# define SYS_F_OPEN 19 -# define SYS_F_CLOSE 20 -# define SYS_F_IOCTL 21 -# define SYS_F_STAT 22 -# define SYS_F_FCNTL 23 -# define SYS_F_FSTAT 24 -# define SYS_F_SENDFILE 25 +# if !OPENSSL_API_3 +# define SYS_F_FOPEN 0 +# define SYS_F_CONNECT 0 +# define SYS_F_GETSERVBYNAME 0 +# define SYS_F_SOCKET 0 +# define SYS_F_IOCTLSOCKET 0 +# define SYS_F_BIND 0 +# define SYS_F_LISTEN 0 +# define SYS_F_ACCEPT 0 +# define SYS_F_WSASTARTUP 0 +# define SYS_F_OPENDIR 0 +# define SYS_F_FREAD 0 +# define SYS_F_GETADDRINFO 0 +# define SYS_F_GETNAMEINFO 0 +# define SYS_F_SETSOCKOPT 0 +# define SYS_F_GETSOCKOPT 0 +# define SYS_F_GETSOCKNAME 0 +# define SYS_F_GETHOSTBYNAME 0 +# define SYS_F_FFLUSH 0 +# define SYS_F_OPEN 0 +# define SYS_F_CLOSE 0 +# define SYS_F_IOCTL 0 +# define SYS_F_STAT 0 +# define SYS_F_FCNTL 0 +# define SYS_F_FSTAT 0 +# define SYS_F_SENDFILE 0 +# endif /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ @@ -229,6 +235,8 @@ typedef struct ERR_string_data_st { DEFINE_LHASH_OF(ERR_STRING_DATA); void ERR_put_error(int lib, int func, int reason, const char *file, int line); +void ERR_put_func_error(int lib, const char *func, int reason, + const char *file, int line); void ERR_set_error_data(char *data, int flags); unsigned long ERR_get_error(void); diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 5538e4d..3afa5e5 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -766,7 +766,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, } if (errno) { - SYSerr(SYS_F_OPENDIR, get_last_sys_error()); + FUNCerr("readdir", get_last_sys_error()); ERR_add_error_data(3, "OPENSSL_DIR_read(&ctx, '", dir, "')"); SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB); goto err; diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index c88368e..a943414 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2075,7 +2075,7 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) else #endif #ifdef OPENSSL_NO_KTLS - SYSerr(SYS_F_SENDFILE, get_last_sys_error()); + FUNCerr("sendfile", get_last_sys_error()); #else SSLerr(SSL_F_SSL_SENDFILE, SSL_R_UNINITIALIZED); #endif diff --git a/test/errtest.c b/test/errtest.c index df222da..88ff860 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -44,9 +44,28 @@ static int vdata_appends(void) return TEST_str_eq(data, "hello world"); } +/* Test that setting a platform error sets the right values. */ +static int platform_error(void) +{ + const char *file = __FILE__, *f, *data; + const int line = __LINE__; + int l; + unsigned long e; + + ERR_put_func_error(ERR_LIB_SYS, "exit", ERR_R_INTERNAL_ERROR, file, line); + if (!TEST_ulong_ne(e = ERR_get_error_line_data(&f, &l, &data, NULL), 0) + || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR) + || !TEST_int_eq(l, line) + || !TEST_str_eq(f, file) + || !TEST_str_eq(data, "calling function exit")) + return 0; + return 1; +} + int setup_tests(void) { ADD_TEST(preserves_system_error); ADD_TEST(vdata_appends); + ADD_TEST(platform_error); return 1; } diff --git a/util/libcrypto.num b/util/libcrypto.num index c062a99..e18fdca 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4690,3 +4690,4 @@ EVP_KEYMGMT_up_ref 4795 3_0_0 EXIST::FUNCTION: EVP_KEYMGMT_free 4796 3_0_0 EXIST::FUNCTION: EVP_KEYMGMT_provider 4797 3_0_0 EXIST::FUNCTION: X509_PUBKEY_dup 4798 3_0_0 EXIST::FUNCTION: +ERR_put_func_error 4799 3_0_0 EXIST::FUNCTION: