From nobody Tue Dec 14 18:09:36 2021 X-Original-To: dev-commits-src-main@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 5D68718D19A4; Tue, 14 Dec 2021 18:09:37 +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 4JD5xY0cVxz4ZW9; Tue, 14 Dec 2021 18:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E93304EE7; Tue, 14 Dec 2021 18:09:36 +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 1BEI9aZK002495; Tue, 14 Dec 2021 18:09:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEI9aTT002494; Tue, 14 Dec 2021 18:09:36 GMT (envelope-from git) Date: Tue, 14 Dec 2021 18:09:36 GMT Message-Id: <202112141809.1BEI9aTT002494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 27bb8830d555 - main - SSL_sendfile: Replace ERR_raise_data with SYSerr. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 27bb8830d555621d4292da8a83f3bc09176fd00d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639505377; 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=ZXOBBypL8Y9l32vs3us1UBT1JGOy2H0MwgPUapebB+w=; b=Xw21NwDmUCOsSSPLY//n9ndvtYZc+EApzCvvwBOW/P413A07c3Zlffh+Y2+hl+N7Xt/Xu/ raWDfJEk0ZHa6zeNmngQyQo0IOjYOEnIS4HF/GbXUerQrkH0ykaK4e1uowKDrCKga0Zxca XsIS8jRc2gqS+Ya/5dKOO8nnb/nTkZQh5eCeN6yKnP6aKzk780D6pH7T4e5XqJDWFSUKL0 QmQG7jl6UN00wkj2gjdwjsPObwbvQjSy8r2xmY8vZFCXpBvcJR6VTB8njLETVokiD8Fd+y HKJawj8KefRArc8himwub5mCm1as3VHjUqLPEXimvduXbIHTyulgB9yIl14nxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639505377; a=rsa-sha256; cv=none; b=Ld7B73Cra16cKdJIhj0BD/A9LZJk9JsibhZwjre1Tm0YeFvz38doXOH6BK1xsw5EyastTq ZTUrY3peBsWqQ1NbjuBg0peGXOB8um1cDtwtn4HMIux3G3Xg0KV2meg/Vtta9npcvx//Tu m5BQ9p2k7HOWe0SJKp62n0FSKITtjVqtobIB9tN1Xt5fZNu3VWciZXNmWGMsYG5SXvdx+R xGxhZ7vvSYgYnsgXM/Vgt7mCIm31ZnQRQTAG+S57H1Td9g11NuBWOLm6eycHrJLxJYnbLi rOJEPye9y9TltalATktP5hta5HkN42L7zEg1I/h7eC9Dw6KSsLvOZ7DJw5SqWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=27bb8830d555621d4292da8a83f3bc09176fd00d commit 27bb8830d555621d4292da8a83f3bc09176fd00d Author: John Baldwin AuthorDate: 2021-12-14 18:07:38 +0000 Commit: John Baldwin 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);