diff options
| author | tb <> | 2019-02-25 19:40:05 +0000 |
|---|---|---|
| committer | tb <> | 2019-02-25 19:40:05 +0000 |
| commit | 005ef6c08c766a6de14eec11a3c73593c724505f (patch) | |
| tree | 81fb2cedd45743443dd9d1630bd192592cfe42dc /src/lib/libssl/tls13_internal.h | |
| parent | 045deccf8d58fad15cc18cc95b1fe0f702e32d19 (diff) | |
| download | openbsd-005ef6c08c766a6de14eec11a3c73593c724505f.tar.gz openbsd-005ef6c08c766a6de14eec11a3c73593c724505f.tar.bz2 openbsd-005ef6c08c766a6de14eec11a3c73593c724505f.zip | |
revert "Move struct ssl_handshake_tls13_st definition", i.e., move
SSL_HANDSHAKE_TLS13 back to ssl_locl.h.
discussed with jsing and inoguchi
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/tls13_internal.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h index b3b510c690..aa28ee7e87 100644 --- a/src/lib/libssl/tls13_internal.h +++ b/src/lib/libssl/tls13_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_internal.h,v 1.22 2019/02/25 16:46:17 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_internal.h,v 1.23 2019/02/25 19:40:05 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
| 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
| @@ -149,28 +149,7 @@ struct tls13_handshake_stage { | |||
| 149 | uint8_t message_number; | 149 | uint8_t message_number; |
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | typedef struct ssl_handshake_tls13_st { | 152 | typedef struct ssl_handshake_tls13_st SSL_HANDSHAKE_TLS13; |
| 153 | uint16_t min_version; | ||
| 154 | uint16_t max_version; | ||
| 155 | uint16_t version; | ||
| 156 | |||
| 157 | /* Version proposed by peer server. */ | ||
| 158 | uint16_t server_version; | ||
| 159 | |||
| 160 | /* X25519 key share. */ | ||
| 161 | uint8_t *x25519_public; | ||
| 162 | uint8_t *x25519_private; | ||
| 163 | uint8_t *x25519_peer_public; | ||
| 164 | |||
| 165 | struct tls13_secrets *secrets; | ||
| 166 | |||
| 167 | uint8_t *cookie; | ||
| 168 | size_t cookie_len; | ||
| 169 | |||
| 170 | /* Preserved transcript hash. */ | ||
| 171 | uint8_t transcript_hash[EVP_MAX_MD_SIZE]; | ||
| 172 | size_t transcript_hash_len; | ||
| 173 | } SSL_HANDSHAKE_TLS13; | ||
| 174 | 153 | ||
| 175 | struct tls13_ctx { | 154 | struct tls13_ctx { |
| 176 | SSL *ssl; | 155 | SSL *ssl; |
