diff options
| author | tb <> | 2021-09-10 14:44:25 +0000 |
|---|---|---|
| committer | tb <> | 2021-09-10 14:44:25 +0000 |
| commit | dd252d4bd6bbd10c87935b33dc63e5267b77dc9e (patch) | |
| tree | ed7068ea28c1da32807c7bd176d2f98d27681644 | |
| parent | 9283959412d3b07856a9b27ad31b495b8a384303 (diff) | |
| download | openbsd-dd252d4bd6bbd10c87935b33dc63e5267b77dc9e.tar.gz openbsd-dd252d4bd6bbd10c87935b33dc63e5267b77dc9e.tar.bz2 openbsd-dd252d4bd6bbd10c87935b33dc63e5267b77dc9e.zip | |
Remove struct tls_session_ticket_ext_st and TLS_SESSION_TICKET_EXT
from public visibility.
with/ok jsing
| -rw-r--r-- | src/lib/libssl/ssl.h | 4 | ||||
| -rw-r--r-- | src/lib/libssl/tls1.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index fba9ea243f..c93f3739bc 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.202 2021/09/10 09:25:29 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.203 2021/09/10 14:44:25 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -357,7 +357,9 @@ extern "C" { | |||
| 357 | * in SSL_CTX. */ | 357 | * in SSL_CTX. */ |
| 358 | typedef struct ssl_st *ssl_crock_st; | 358 | typedef struct ssl_st *ssl_crock_st; |
| 359 | 359 | ||
| 360 | #if defined(LIBRESSL_INTERNAL) | ||
| 360 | typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT; | 361 | typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT; |
| 362 | #endif | ||
| 361 | typedef struct ssl_method_st SSL_METHOD; | 363 | typedef struct ssl_method_st SSL_METHOD; |
| 362 | typedef struct ssl_cipher_st SSL_CIPHER; | 364 | typedef struct ssl_cipher_st SSL_CIPHER; |
| 363 | typedef struct ssl_session_st SSL_SESSION; | 365 | typedef struct ssl_session_st SSL_SESSION; |
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 238b202162..d091ae7ca9 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.46 2021/09/08 12:56:14 tb Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.47 2021/09/10 14:44:25 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -771,11 +771,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 771 | #define TLS_MD_MASTER_SECRET_CONST "master secret" | 771 | #define TLS_MD_MASTER_SECRET_CONST "master secret" |
| 772 | #define TLS_MD_MASTER_SECRET_CONST_SIZE 13 | 772 | #define TLS_MD_MASTER_SECRET_CONST_SIZE 13 |
| 773 | 773 | ||
| 774 | #if defined(LIBRESSL_INTERNAL) | ||
| 774 | /* TLS Session Ticket extension struct. */ | 775 | /* TLS Session Ticket extension struct. */ |
| 775 | struct tls_session_ticket_ext_st { | 776 | struct tls_session_ticket_ext_st { |
| 776 | unsigned short length; | 777 | unsigned short length; |
| 777 | void *data; | 778 | void *data; |
| 778 | }; | 779 | }; |
| 780 | #endif | ||
| 779 | 781 | ||
| 780 | #ifdef __cplusplus | 782 | #ifdef __cplusplus |
| 781 | } | 783 | } |
