From nobody Thu Feb 17 22:56:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2121119C7082; Thu, 17 Feb 2022 22:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K09Dp0QcXz3qB3; Thu, 17 Feb 2022 22:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645138602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qHlKC381Y+BYnzwVNJAlS8oGF3Q8NTxR4Q4GaBJlZ/Q=; b=Ow6ZznyJPHMTFnNH5VxlkYDCdtGERqrlUMsUVMPbEuBFlQgUg3BNMdtstg+ZFGNd+onhuo +IIMtVxwzwyVXoWaQ1LjQ23K0xTBMvh0Z0BnI+AHg6ws3jjAr93J5ontV+6T1/jtOs1jus y+wPqzQcb0FNT3EKxAObQOO+y06yHXdR2AI5ddph6u4wi2ouHeAENUvJzJ7e1cCdAH7ac/ hPsIdqG59nESsN5OcIOnS7USKuxGpJQminQ1hkY7dM6fBFByVzc2RQPyp860aIx6wFJ7nx F2y4OQ3CKfQv8G2IHH8r4+IjiEJKQ91Z18LjoJLPviiswOa+/lNM5WC2XgDlWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DFA16124C9; Thu, 17 Feb 2022 22:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21HMuf3F087729; Thu, 17 Feb 2022 22:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HMufho087728; Thu, 17 Feb 2022 22:56:41 GMT (envelope-from git) Date: Thu, 17 Feb 2022 22:56:41 GMT Message-Id: <202202172256.21HMufho087728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 96ec9e3c313d - stable/13 - SSL_sendfile: Replace ERR_raise_data with SYSerr. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 96ec9e3c313d291b87547a557f996e5d9bd16b28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645138602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qHlKC381Y+BYnzwVNJAlS8oGF3Q8NTxR4Q4GaBJlZ/Q=; b=cp6RWKtEHRfhtfObbuCK3M/RljmAvjfPZgr+6CNQGt1u0H7KNuhD1AVlstcfe4vhxLQTkj il6we4V3VxZvVcEdCn2hXzKYIWafhb3yDg00l9LqrQCd477ueqLUTvuWteh94zqVXDkMY0 HKgXXEf90A91948E/4hL1UldTFB0a9pq3D9nWJBBp8JMdCRiMmbPfplg6rLLoWPoZ9uePe faCrJ/RU3KvY0XH9Umk6sflEDQoH8MscyPtnLtTOe5Es19h2oVE64B4PKlEhXrbQgIaQox z1nAjyCW0PJ4++QP15C81/zVr4A2dISUjnkWr4mkajItRQ3L6Y0+Q5inZMCVjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645138602; a=rsa-sha256; cv=none; b=I2NMRuz7tRqrgqzK3JwV9EGd9JKbCiPQbvN6X4+EOuNqgovkz0WEnfrPyHLwGC0W+pBlDg tFiHhQKFcgE4SnGXqmfbQ0Ekwoda8r5j2wlSH/LbNfUujfip87fy0GovkDaj9J1bzQtwv1 pj4YPSnqapcLGkCqaw/dc2pvDbJCn1Q8WstgDzMdrfN9tUP9EDp23sCslg/Ej4tu+fXXap lhaHsxkvDuKJAMH/MjIsbFX5jIr6BR0SiwlONxika+3edWP6M9p/IhUpSrOuf98CDlzAkX zxcejFAbQgr9J9+lzwoyyldAAjIiaQoc9Z244o4TvOXov+G4hD+QaU8saih/ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=96ec9e3c313d291b87547a557f996e5d9bd16b28 commit 96ec9e3c313d291b87547a557f996e5d9bd16b28 Author: John Baldwin AuthorDate: 2022-02-17 22:51:58 +0000 Commit: John Baldwin 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);