diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2019-02-25 19:40:06 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2019-02-25 19:40:06 +0000 |
| commit | df689522a97f07f630f762b1c614795c862f1021 (patch) | |
| tree | 684df66b16b8fb0bc0c9f610b844e22c89005648 /lib/libssl/ssl_locl.h | |
| parent | c870cfc8a8776ffee1123ec88ff166a19991543f (diff) | |
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 'lib/libssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index e98c4f7c501..82674121b4d 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.237 2019/02/25 14:36:25 inoguchi Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.238 2019/02/25 19:40:05 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -434,6 +434,29 @@ typedef struct ssl_handshake_st { uint32_t extensions_seen; } SSL_HANDSHAKE; +typedef struct ssl_handshake_tls13_st { + uint16_t min_version; + uint16_t max_version; + uint16_t version; + + /* Version proposed by peer server. */ + uint16_t server_version; + + /* X25519 key share. */ + uint8_t *x25519_public; + uint8_t *x25519_private; + uint8_t *x25519_peer_public; + + struct tls13_secrets *secrets; + + uint8_t *cookie; + size_t cookie_len; + + /* Preserved transcript hash. */ + uint8_t transcript_hash[EVP_MAX_MD_SIZE]; + size_t transcript_hash_len; +} SSL_HANDSHAKE_TLS13; + typedef struct ssl_ctx_internal_st { uint16_t min_version; uint16_t max_version; |