diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-06-11 15:42:42 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-07-22 16:24:56 +0200 |
| commit | 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (patch) | |
| tree | 22bf3958a3b0046ae690e57dd5eaad90c6fcf25a /ssl | |
| parent | 1372560f64c9a7cfad1979fa8c41bee335a04373 (diff) | |
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 <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9072)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_cert.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 5538e4da24..86400ff9a0 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()); + SYSerr("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 c88368ed61..9125fbfcd5 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()); + SYSerr("sendfile", get_last_sys_error()); #else SSLerr(SSL_F_SSL_SENDFILE, SSL_R_UNINITIALIZED); #endif |