From 71bd73f60686558ba44dd16aefecafa4ad617648 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 25 Feb 2019 19:40:05 +0000
Subject: revert "Move struct ssl_handshake_tls13_st definition", i.e., move
SSL_HANDSHAKE_TLS13 back to ssl_locl.h.
discussed with jsing and inoguchi
---
src/lib/libssl/ssl_locl.h | 25 ++++++++++++++++++++++++-
src/lib/libssl/tls13_internal.h | 25 ++-----------------------
2 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index e98c4f7c50..82674121b4 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/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;
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 @@
-/* $OpenBSD: tls13_internal.h,v 1.22 2019/02/25 16:46:17 jsing Exp $ */
+/* $OpenBSD: tls13_internal.h,v 1.23 2019/02/25 19:40:05 tb Exp $ */
/*
* Copyright (c) 2018 Bob Beck <beck@openbsd.org>
* Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
@@ -149,28 +149,7 @@ struct tls13_handshake_stage {
uint8_t message_number;
};
-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_handshake_tls13_st SSL_HANDSHAKE_TLS13;
struct tls13_ctx {
SSL *ssl;
--
cgit v1.2.3-55-g6feb