move token store definition to quic_predef.h

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26517)

diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h
index 4169b0913554aed9446a584f4fc70a9607b562cb..b7658b5719551d50aa9ef85dcefc699dcbf06226 100644 (file)
--- a/include/internal/quic_predef.h
+++ b/include/internal/quic_predef.h
@@ -12,6 +12,7 @@
 
 # ifndef OPENSSL_NO_QUIC
 
+typedef struct ssl_token_store_st SSL_TOKEN_STORE;
 typedef struct quic_port_st QUIC_PORT;
 typedef struct quic_channel_st QUIC_CHANNEL;
 typedef struct quic_tls_st QUIC_TLS;

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index 71eed52a5cf23aad0f8e6d292bcd8a33be4ca7c2..9ba1ab21f4d16c0614160695eb9556ca7cb0c289 100644 (file)
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -2285,7 +2285,6 @@ int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets);
 size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx);
 
 /* QUIC support */
-typedef struct ssl_token_store_st SSL_TOKEN_STORE;
 int SSL_handle_events(SSL *s);
 __owur int SSL_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite);
 __owur int SSL_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc);