diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-31 15:24:20 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-02 11:41:54 +0200 |
| commit | ff988500c2f39ae61b2836167b6e0e7b2021220c (patch) | |
| tree | ead6acf74e2cf8c8be430e02f78dddcf8281b0cc /ssl | |
| parent | 823ee00a396f91df4517af13dafae679ae10b3f4 (diff) | |
Replace FUNCerr with ERR_raise_data
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9496)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_cert.c | 5 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 3afa5e5387..f902091968 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -766,8 +766,9 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, } if (errno) { - FUNCerr("readdir", get_last_sys_error()); - ERR_add_error_data(3, "OPENSSL_DIR_read(&ctx, '", dir, "')"); + ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), + "calling OPENSSL_dir_read(%s)", + 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 a943414255..0d40ecaec9 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2075,7 +2075,8 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) else #endif #ifdef OPENSSL_NO_KTLS - FUNCerr("sendfile", get_last_sys_error()); + ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), + "calling sendfile()"); #else SSLerr(SSL_F_SSL_SENDFILE, SSL_R_UNINITIALIZED); #endif |