diff options
| author | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-02-25 14:36:26 +0000 |
|---|---|---|
| committer | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-02-25 14:36:26 +0000 |
| commit | b9611faa7797f1080835b1d68e7e380a0238efca (patch) | |
| tree | 71e68d41ad1658b0c4f52aebcf5f4239b6ca087d /lib/libssl | |
| parent | c8ff56ac14938c5f5136b1af51070292678dc793 (diff) | |
Move struct ssl_handshake_tls13_st definition
This solves build error on luna88k with gcc3.
ok aoyama@ jca@ jsing@ tb@
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 25 | ||||
| -rw-r--r-- | lib/libssl/tls13_internal.h | 25 |
2 files changed, 24 insertions, 26 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 67a2e04784d..e98c4f7c501 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.236 2019/02/14 17:50:07 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.237 2019/02/25 14:36:25 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -434,29 +434,6 @@ 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; diff --git a/lib/libssl/tls13_internal.h b/lib/libssl/tls13_internal.h index 43b65d6162c..0e26d9c01c2 100644 --- a/lib/libssl/tls13_internal.h +++ b/lib/libssl/tls13_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_internal.h,v 1.20 2019/02/21 17:09:51 jsing Exp $ */ +/* $OpenBSD: tls13_internal.h,v 1.21 2019/02/25 14:36:25 inoguchi Exp $ */ /* * Copyright (c) 2018 Bob Beck <beck@openbsd.org> * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> @@ -149,7 +149,28 @@ struct tls13_handshake_stage { uint8_t message_number; }; -typedef struct ssl_handshake_tls13_st SSL_HANDSHAKE_TLS13; +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; struct tls13_ctx { SSL *ssl; |