Skip to content

Commit

Permalink
Fix the same BIO_FLAGS macro definition
Browse files Browse the repository at this point in the history
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 #17546)
  • Loading branch information
yangyangtiantianlonglong authored and t8m committed Jan 21, 2022
1 parent 5288303 commit e278f18
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion include/internal/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 2 additions & 0 deletions include/openssl/bio.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit e278f18

Please sign in to comment.