From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 9 Jan 2023 11:20:08 +0000 (+0000)
Subject: QUIC BIO Poll Descriptors: simplify custom interface
X-Git-Tag: openssl-3.2.0-alpha1~1462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=692df8d34401c95ee446e26033711030e471e7e7;p=thirdparty%2Fopenssl.git

QUIC BIO Poll Descriptors: simplify custom interface

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
---

diff --git a/doc/man3/BIO_get_rpoll_descriptor.pod b/doc/man3/BIO_get_rpoll_descriptor.pod
index 36d6b64ff58..423ad1cdda4 100644
--- a/doc/man3/BIO_get_rpoll_descriptor.pod
+++ b/doc/man3/BIO_get_rpoll_descriptor.pod
@@ -13,10 +13,7 @@ can be used to determine when a BIO object can next be read or written
      int type;
      union {
          int     fd;
-         union {
-             void        *ptr;
-             uint64_t    u64;
-         } custom[BIO_POLL_DESCRIPTOR_NUM_CUSTOM];
+         void    *custom;
      } value;
  } BIO_POLL_DESCRIPTOR;
 
@@ -75,9 +72,8 @@ complete a BIO_write() operation.
 
 Type values beginning with this value (inclusive) are reserved for application
 allocation for custom poll descriptor types. The field I<value.custom> in the
-B<BIO_POLL_DESCRIPTOR> is an array of length B<BIO_POLL_DESCRIPTOR_NUM_CUSTOM>.
-Each entry in this array can store a void pointer or a B<uint64_t> and can be
-used by the application arbitrarily.
+B<BIO_POLL_DESCRIPTOR> is an opaque pointer which can be used by the application
+arbitrarily.
 
 =back
 
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index dbb65f50e48..037f1ed3fff 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -383,16 +383,12 @@ 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_CUSTOM_START    8192
-#define BIO_POLL_DESCRIPTOR_NUM_CUSTOM      4
 
 typedef struct bio_poll_descriptor_st {
     int type;
     union {
         int     fd;
-        union {
-            void        *ptr;
-            uint64_t    u64;
-        } custom[BIO_POLL_DESCRIPTOR_NUM_CUSTOM];
+        void    *custom;
     } value;
 } BIO_POLL_DESCRIPTOR;