summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2023-05-22 15:23:21 +0100
committerMatt Caswell <matt@openssl.org>2023-05-24 12:18:33 +0100
commit674b61ebd982d6a6564ac1f90d8cde22371564bc (patch)
treecd28400502f740530186bbd59bf5700f9bbb26b5 /include
parentc2786c8ea732592f708e588f0f5849716914a313 (diff)
Create internal/ssl.h
We create the internal/ssl.h header file and move the typedef for ossl_msg_cb. This is needed by both the QUIC code (which generally doesn't include ssl_local.h) and the rest of libssl. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20914)
Diffstat (limited to 'include')
-rw-r--r--include/internal/quic_types.h4
-rw-r--r--include/internal/ssl.h19
2 files changed, 20 insertions, 3 deletions
diff --git a/include/internal/quic_types.h b/include/internal/quic_types.h
index 2fa36d46e9..830c755779 100644
--- a/include/internal/quic_types.h
+++ b/include/internal/quic_types.h
@@ -11,6 +11,7 @@
# define OSSL_QUIC_TYPES_H
# include <openssl/ssl.h>
+# include <internal/ssl.h>
# include <assert.h>
# include <string.h>
@@ -95,9 +96,6 @@ static ossl_unused ossl_inline int ossl_quic_conn_id_eq(const QUIC_CONN_ID *a,
# define QUIC_STATELESS_RESET_TOKEN_LEN 16
-typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
- const void *buf, size_t len, SSL *ssl, void *arg);
-
# endif
#endif
diff --git a/include/internal/ssl.h b/include/internal/ssl.h
new file mode 100644
index 0000000000..3bf9bf9e34
--- /dev/null
+++ b/include/internal/ssl.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <openssl/ssl.h>
+
+#ifndef OSSL_INTERNAL_SSL_H
+# define OSSL_INTERNAL_SSL_H
+# pragma once
+
+typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
+ const void *buf, size_t len, SSL *ssl, void *arg);
+
+#endif