git: aa7208254996 - main - OpenSSL: Fix the same BIO_FLAGS macro definition

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=aa7208254996a66fb0b363bb696fe65d81335d81

commit aa7208254996a66fb0b363bb696fe65d81335d81
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-02-01 18:38:49 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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;