From nobody Tue Feb 01 18:39:23 2022 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 657E019ACA87; Tue, 1 Feb 2022 18:39:24 +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 4JpDHJ0B3Qz4VHw; Tue, 1 Feb 2022 18:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643740764; 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=NnsSSzGHNDJn6SVHF+VMIZvFSgDNrY5CRCwjY8raa6A=; b=j+5PtabucnBXpaM4DtKfQi2PFxQuMu/vPox1iIEChFdYCTCPYNLmQuROxq7aEssAiJEVgZ 2Oyr/WfXlYj/2Jcayos+cT2JaLf905dk16oZBFrrvc/wSrOSYyGo+zkRnTvttdiakLXXy+ aAw8cKyAuTEt41vQJgy/MdgBS/m9KkKTPRDBwqnwnqfSddXzTy+FjbOba182pAgdgTBHDi 6z3C6wVFqGnnFqQm4qfD8QwPBevyGZbwTa7GQNUEucKd1pn/qKjin59+dbpr2Pt6udtRro 5BJitSicRqH4hEAv+7bizB2TUJt2i/mkSQmq9A8LXIYAo8JPeqHZC0sH1MY+dA== 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 D970F15CD0; Tue, 1 Feb 2022 18:39:23 +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 211IdNOu009079; Tue, 1 Feb 2022 18:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211IdNbR009078; Tue, 1 Feb 2022 18:39:23 GMT (envelope-from git) Date: Tue, 1 Feb 2022 18:39:23 GMT Message-Id: <202202011839.211IdNbR009078@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: aa7208254996 - main - OpenSSL: Fix the same BIO_FLAGS macro definition 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: aa7208254996a66fb0b363bb696fe65d81335d81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643740764; 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=NnsSSzGHNDJn6SVHF+VMIZvFSgDNrY5CRCwjY8raa6A=; b=d5cZ9+rpl6hKe+ESsxPUtu6XB2H1aMHA+gbRHiwUuTgtydsVqUB04tI1OhyLmDBk1WocA+ x4syWlyBwj24bsBu0RK5Vgnsb3oGyly6jEBbMYL5z9Ugy3268umJlFj2bxQDZo18/Tgl7X Xhc4Y43i9EVmulWjUHVCKS/2JWMyFAq2bFqQUwKKs9Iq012BBhkH4KkjbzWSokiIlDKEan QLXzqHYwybgRyWPBQVl6mikKT9Kw1XjVxNYX1v6BbtU3QYUxXqHaksVzq+j6xCVR28/JCt paOApa1dL7PqJvMsh1M/FDc1a5726+Qzf77dRy3cMH2NDqEzdS1s6CE9ZDUUMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643740764; a=rsa-sha256; cv=none; b=s103xvo12VEnhW4oPAOFLT7jAa85AALPs/ZtifbcigtMTRFCE0uJ042Jo5S3Qev8HQtLkt g43n0bEXYpNQIYxklIfVvTuHhEY2wLdbA82mPixYxwlC/yK5Kv85Iuc2qJhbbHOMSeRLQe Y6ej+NQXIjEsCxA4VhUie/gXmiuWR7vQfvivQAAwdAnfILSHe5Y8nu9UHqUxlcWj/50Wjk Ibs0FNYqZXTdJIrZV94hlZWlj4R3Bmw6qqSld2/6HbKLK9crAu2oduwbFuOyblczD/z3a5 SWU2IntTaUO6w+a/AatzWLDgbTd/ZwHK5PUzrj5P0B0SZBoQkfVST39bHKG2Rw== 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=aa7208254996a66fb0b363bb696fe65d81335d81 commit aa7208254996a66fb0b363bb696fe65d81335d81 Author: John Baldwin AuthorDate: 2022-02-01 18:38:49 +0000 Commit: John Baldwin CommitDate: 2022-02-01 18:38:49 +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 MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34135 --- 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;