summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2021-09-10 14:44:26 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2021-09-10 14:44:26 +0000
commit486606a1a197b1e4122f2c4be6a6801c68f2c83d (patch)
tree67fe82c4e79647e91ab03e20ead52a6786338f28
parent2b103c504501882547feeb400ffb57c30b723e18 (diff)
Remove struct tls_session_ticket_ext_st and TLS_SESSION_TICKET_EXT
from public visibility. with/ok jsing
-rw-r--r--lib/libssl/ssl.h4
-rw-r--r--lib/libssl/tls1.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index fba9ea243f1..c93f3739bce 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.202 2021/09/10 09:25:29 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.203 2021/09/10 14:44:25 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -357,7 +357,9 @@ extern "C" {
* in SSL_CTX. */
typedef struct ssl_st *ssl_crock_st;
+#if defined(LIBRESSL_INTERNAL)
typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
+#endif
typedef struct ssl_method_st SSL_METHOD;
typedef struct ssl_cipher_st SSL_CIPHER;
typedef struct ssl_session_st SSL_SESSION;
diff --git a/lib/libssl/tls1.h b/lib/libssl/tls1.h
index 238b202162d..d091ae7ca91 100644
--- a/lib/libssl/tls1.h
+++ b/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls1.h,v 1.46 2021/09/08 12:56:14 tb Exp $ */
+/* $OpenBSD: tls1.h,v 1.47 2021/09/10 14:44:25 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -771,11 +771,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#define TLS_MD_MASTER_SECRET_CONST "master secret"
#define TLS_MD_MASTER_SECRET_CONST_SIZE 13
+#if defined(LIBRESSL_INTERNAL)
/* TLS Session Ticket extension struct. */
struct tls_session_ticket_ext_st {
unsigned short length;
void *data;
};
+#endif
#ifdef __cplusplus
}