diff options
| author | yangyangtiantianlonglong <yangtianlong1224@163.com> | 2022-01-19 11:19:52 +0800 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-01-21 12:19:58 +0100 |
| commit | 3d046c4d047a55123beeceffe9f8bae09159445e (patch) | |
| tree | ea77dcd613d3ca21cd997acc14c1f4c238e31627 | |
| parent | ca048994ae1431965a068b17e1f17afa2345e1f5 (diff) | |
Fix the same BIO_FLAGS macro definition
Also add comment to the public header to avoid
making another conflict in future.
Fixes #17545
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17546)
(cherry picked from commit e278f18563dd3dd67c00200ee30402f48023c6ef)
| -rw-r--r-- | include/internal/bio.h | 2 | ||||
| -rw-r--r-- | include/openssl/bio.h.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/internal/bio.h b/include/internal/bio.h index 2d36a7b980..02f7222ab4 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -48,9 +48,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/include/openssl/bio.h.in b/include/openssl/bio.h.in index 2c65b7e1a7..686dad3099 100644 --- a/include/openssl/bio.h.in +++ b/include/openssl/bio.h.in @@ -209,6 +209,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; |