summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2023-08-30 13:45:40 +0100
committerHugo Landau <hlandau@openssl.org>2023-09-01 14:02:50 +0100
commit2619d10ace8ee8e56425771bac48aa12769421f2 (patch)
tree7f2f0d302cf5cce6e9ca268668dd464851bddb4b /include
parentd492e34351ae49e899a7c66f1882703a4fedced2 (diff)
BIO: Allow third parties to use integers instead of pointers for poll descriptors
Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21905)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/bio.h.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index aa05d7d9cf..735361b17b 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -387,10 +387,11 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
- int type;
+ uint32_t type;
union {
- int fd;
- void *custom;
+ int fd;
+ void *custom;
+ uintptr_t custom_ui;
} value;
} BIO_POLL_DESCRIPTOR;