Date: Tue, 14 Dec 2021 18:09:36 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 27bb8830d555 - main - SSL_sendfile: Replace ERR_raise_data with SYSerr. Message-ID: <202112141809.1BEI9aTT002494@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=27bb8830d555621d4292da8a83f3bc09176fd00d commit 27bb8830d555621d4292da8a83f3bc09176fd00d Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2021-12-14 18:07:38 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-12-14 18:07:38 +0000 SSL_sendfile: Replace ERR_raise_data with SYSerr. ERR_raise_data is only present in OpenSSL 3.0 and later. Reviewed by: jkim Obtained from: CheriBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33363 --- crypto/openssl/ssl/ssl_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index 6081d8f05b11..a8514013b45e 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -2026,7 +2026,8 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) } #ifdef OPENSSL_NO_KTLS - ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR, "calling sendfile()"); + SYSerr(SSL_F_SSL_SENDFILE, ERR_R_INTERNAL_ERROR); + ERR_add_error_data(1, "calling sendfile()"); return -1; #else ret = ktls_sendfile(SSL_get_wfd(s), fd, offset, size, flags);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112141809.1BEI9aTT002494>