From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 31 Jan 2024 12:34:21 +0000 (+0000)
Subject: BIO: Add SSL poll descriptor type
X-Git-Tag: openssl-3.3.0-alpha1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4999f2b746a6845536e720252791601acd6bdad;p=thirdparty%2Fopenssl.git

BIO: Add SSL poll descriptor type

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)
---

diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index 418d119737f..d1a29bee328 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -384,6 +384,7 @@ typedef struct bio_mmsg_cb_args_st {
 
 #define BIO_POLL_DESCRIPTOR_TYPE_NONE       0
 #define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD    1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL        2
 #define BIO_POLL_DESCRIPTOR_CUSTOM_START    8192
 
 typedef struct bio_poll_descriptor_st {
@@ -392,6 +393,7 @@ typedef struct bio_poll_descriptor_st {
         int         fd;
         void        *custom;
         uintptr_t   custom_ui;
+        SSL         *ssl;
     } value;
 } BIO_POLL_DESCRIPTOR;