diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 94bb76eca3..1653b2ab96 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.225 2018/11/21 15:13:29 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.226 2019/01/18 12:09:52 beck 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 | * |
@@ -162,6 +162,7 @@ | |||
162 | 162 | ||
163 | #include "bytestring.h" | 163 | #include "bytestring.h" |
164 | #include "ssl_sigalgs.h" | 164 | #include "ssl_sigalgs.h" |
165 | #include "tls13_internal.h" | ||
165 | 166 | ||
166 | __BEGIN_HIDDEN_DECLS | 167 | __BEGIN_HIDDEN_DECLS |
167 | 168 | ||
@@ -430,6 +431,22 @@ typedef struct ssl_handshake_st { | |||
430 | unsigned char *key_block; | 431 | unsigned char *key_block; |
431 | } SSL_HANDSHAKE; | 432 | } SSL_HANDSHAKE; |
432 | 433 | ||
434 | typedef struct ssl_handshake_tls13_st { | ||
435 | uint16_t min_version; | ||
436 | uint16_t max_version; | ||
437 | uint16_t version; | ||
438 | |||
439 | /* Version proposed by peer server. */ | ||
440 | uint16_t server_version; | ||
441 | |||
442 | /* X25519 key share. */ | ||
443 | uint8_t *x25519_public; | ||
444 | uint8_t *x25519_private; | ||
445 | uint8_t *x25519_peer_public; | ||
446 | |||
447 | struct tls13_secrets *secrets; | ||
448 | } SSL_HANDSHAKE_TLS13; | ||
449 | |||
433 | typedef struct ssl_ctx_internal_st { | 450 | typedef struct ssl_ctx_internal_st { |
434 | uint16_t min_version; | 451 | uint16_t min_version; |
435 | uint16_t max_version; | 452 | uint16_t max_version; |
@@ -803,6 +820,7 @@ typedef struct ssl3_state_internal_st { | |||
803 | int in_read_app_data; | 820 | int in_read_app_data; |
804 | 821 | ||
805 | SSL_HANDSHAKE hs; | 822 | SSL_HANDSHAKE hs; |
823 | SSL_HANDSHAKE_TLS13 hs_tls13; | ||
806 | 824 | ||
807 | struct { | 825 | struct { |
808 | int new_mac_secret_size; | 826 | int new_mac_secret_size; |