From: Neil Horman <nhorman@openssl.org>
Date: Sun, 2 Feb 2025 22:17:20 +0000 (-0500)
Subject: move token store definition to quic_predef.h
X-Git-Tag: openssl-3.5.0-alpha1~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c536754fd062a38dba31dbb069c3b5f623f6530f;p=thirdparty%2Fopenssl.git

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 509bf66de4e..21cc074a741 100644
--- 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_txpim_st QUIC_TXPIM;
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index d465d77c984..c62b9497730 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -2295,7 +2295,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);