Date: Thu, 17 Feb 2022 22:56:41 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 96ec9e3c313d - stable/13 - SSL_sendfile: Replace ERR_raise_data with SYSerr. Message-ID: <202202172256.21HMufho087728@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=96ec9e3c313d291b87547a557f996e5d9bd16b28 commit 96ec9e3c313d291b87547a557f996e5d9bd16b28 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-02-17 22:51:58 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-02-17 22:51:58 +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 Differential Revision: https://reviews.freebsd.org/D33363 (cherry picked from commit 27bb8830d555621d4292da8a83f3bc09176fd00d) --- 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 b3ae7b1b1336..ff5a9e05660b 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -2028,7 +2028,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?202202172256.21HMufho087728>