From nobody Thu Feb 17 22:56:42 2022 X-Original-To: dev-commits-src-branches@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 3D11019C6EE3; Thu, 17 Feb 2022 22:56:43 +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 4K09Dq0x9rz3qNr; Thu, 17 Feb 2022 22:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645138603; 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=ncUPk+wZkRZ9bHFrk9OuBFFPemcJArL2CxL5J8Qps0c=; b=fjB4i5IZREISBgT2/z5Tje2UlaySXtBf/38ackQ/E6FW9/qaSTAiTLFlwQ9BVQZXnpuq2n fG15kw13WM0oSSVUkjX2gTrxLd844XGiLBQumBzGEdFhfjkjaJW5WafoMdLP9EfwU0fbNm eY3h4u2YyGxKtt9+DlHhUIjw5rboBbOVq9GMn6HiDjqPsYd04I8KR37sPmbyn68NmIVHJ5 h++ecKk+FMKs+gMMCSRAHM0ihqrda9faqXKXnvg36ukHRciobL6PQU9jAu0BNR5J91uItX XBiKiA4rglsKAWTSJx97lhg9/xRp7/VxScXUZBLCEMloHHPpA7QNXQs9KRaNrQ== 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 00FBF1294A; Thu, 17 Feb 2022 22:56:43 +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 21HMugCo087757; Thu, 17 Feb 2022 22:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HMugRw087756; Thu, 17 Feb 2022 22:56:42 GMT (envelope-from git) Date: Thu, 17 Feb 2022 22:56:42 GMT Message-Id: <202202172256.21HMugRw087756@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: e1465e2e1e06 - stable/13 - OpenSSL: Fix the same BIO_FLAGS macro definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e1465e2e1e062324533a9a710783c9ab5c43dc6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645138603; 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=ncUPk+wZkRZ9bHFrk9OuBFFPemcJArL2CxL5J8Qps0c=; b=LFsA50Nx9Uq9p9Y8/ZuRFEob1KKXgukmWpVJbueQnPIMN1W+f5xSzWTYuKCTULGjsXh5xm uGuTL09P5Mru/xy0kODIR1NIthBxlQ2T2DmgpBPxFjYpt8oxD9blMrUmiZCcWmAAnqwD7j ltvFM48xeVEa0Z5gsyrrekTbF9icuozd040rEwWba72StBjmUOLrCSwrAsixFOlWNPVgZS YVu/a0K3SXcoBE712g1kTStIDYJcgN8NBm50nNROBwER6+upG68EWaKMQbMrWHaBKSm/Y/ cEgbAF98doAqsSLLNMNFbTUcCarWFyUXT1AM/3JFnWGgEAQI0kBRu8daq8Tegw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645138603; a=rsa-sha256; cv=none; b=Lqn1rsVmbtOEsWczfWZrcGh0t6ZU3OOPJRtzL6Y03NrgibAVrjzZ71N6FasYF2TpshU1Ff liHotYd82/6nOZwkvjK6jCqdWT/uGrQ3Qd0q/fTSuG70dqBMdbvFnO7ENAzpVlWd0nWVM+ uTIPklkBKTsQWooWMF2NOYosI8hGpG6MP6Sgs9TRa6VBhuRx+WE5mQip6OfXHZePjCy0Gb iANt9C018AnUcHIKyL0QC2jfLqNpELh0UZnbu+2Qb7cAev5uzjTb1HtEyNBcbXJmyyGXlK u2Cx7mUZHJ/LIUxywnHReLDAOfVsGFdBSf/vQpG7Wgutv9XJh5UWb/wnKAfecw== 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=e1465e2e1e062324533a9a710783c9ab5c43dc6f commit e1465e2e1e062324533a9a710783c9ab5c43dc6f Author: John Baldwin AuthorDate: 2022-02-17 22:51:58 +0000 Commit: John Baldwin CommitDate: 2022-02-17 22:51:58 +0000 OpenSSL: Fix the same BIO_FLAGS macro definition Also add comment to the public header to avoid making another conflict in future. Reviewed by: jkim Obtained from: OpenSSL commit 5d4975ecd88ac17d0749513a8fac9a7c7befd900 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34135 (cherry picked from commit aa7208254996a66fb0b363bb696fe65d81335d81) --- crypto/openssl/include/internal/bio.h | 2 +- crypto/openssl/include/openssl/bio.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/openssl/include/internal/bio.h b/crypto/openssl/include/internal/bio.h index 521b5fa2198f..365d41dabbf4 100644 --- a/crypto/openssl/include/internal/bio.h +++ b/crypto/openssl/include/internal/bio.h @@ -46,9 +46,9 @@ int bread_conv(BIO *bio, char *data, size_t datal, size_t *read); * BIO_FLAGS_KTLS_TX_CTRL_MSG means we are about to send a ctrl message next. * BIO_FLAGS_KTLS_RX means we are using ktls with this BIO for receiving. */ -# define BIO_FLAGS_KTLS_TX 0x800 # define BIO_FLAGS_KTLS_TX_CTRL_MSG 0x1000 # define BIO_FLAGS_KTLS_RX 0x2000 +# define BIO_FLAGS_KTLS_TX 0x4000 /* KTLS related controls and flags */ # define BIO_set_ktls_flag(b, is_tx) \ diff --git a/crypto/openssl/include/openssl/bio.h b/crypto/openssl/include/openssl/bio.h index fa50337aab04..66fc0d7c4a55 100644 --- a/crypto/openssl/include/openssl/bio.h +++ b/crypto/openssl/include/openssl/bio.h @@ -191,6 +191,8 @@ extern "C" { # define BIO_FLAGS_NONCLEAR_RST 0x400 # define BIO_FLAGS_IN_EOF 0x800 +/* the BIO FLAGS values 0x1000 to 0x4000 are reserved for internal KTLS flags */ + typedef union bio_addr_st BIO_ADDR; typedef struct bio_addrinfo_st BIO_ADDRINFO;