Move struct tls13_ctx into a header since other things need access to it.

While here, rename struct handshake to struct handshake_stage to avoid
potential ambiguity/conflict with the handshake data struct. Also add
forward and back pointers between SSL and struct tls13_ctx.

ok tb@

1 files changed, 12 insertions, 3 deletions

diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h
index 6b85cfdab9..bb3ff1fe9c 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.10 2019/01/20 12:27:34 jsing Exp $ */
+/* $OpenBSD: tls13_internal.h,v 1.11 2019/01/21 06:58:44 jsing Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
@@ -95,8 +95,6 @@ int tls13_derive_handshake_secrets(struct tls13_secrets *secrets,
 int tls13_derive_application_secrets(struct tls13_secrets *secrets,
     const struct tls13_secret *context);
 
-struct tls13_ctx;
-
 /*
  * Record Layer.
  */
@@ -139,6 +137,17 @@ int tls13_handshake_msg_recv(struct tls13_handshake_msg *msg,
 int tls13_handshake_msg_send(struct tls13_handshake_msg *msg,
     struct tls13_record_layer *rl);
 
+struct tls13_handshake_stage {
+        uint8_t hs_type;
+        uint8_t message_number;
+};
+
+struct tls13_ctx {
+        SSL *ssl;
+        uint8_t mode;
+        struct tls13_handshake_stage handshake_stage;
+};
+
 /*
  * Message Types - RFC 8446, Section B.3.
  *