Convert legacy server to tls_key_share.

This requires a few more additions to the DHE key share code - we need to
be able to either set the DHE parameters or specify the number of key bits
for use with auto DHE parameters. Additionally, we need to be able to
serialise the DHE parameters to send to the client.

This removes the infamous 'tmp' struct from ssl3_state_internal_st.

ok inoguchi@ tb@

1 files changed, 1 insertions, 10 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 83b40d2dd3..cc7b342247 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.374 2022/01/06 18:23:56 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.375 2022/01/07 15:46:30 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1168,15 +1168,6 @@ typedef struct ssl3_state_internal_st {
 
         SSL_HANDSHAKE hs;
 
-        struct  {
-                DH *dh;
-
-                EC_KEY *ecdh; /* holds short lived ECDH key */
-                int ecdh_nid;
-
-                uint8_t *x25519;
-        } tmp;
-
         /* Connection binding to prevent renegotiation attacks */
         unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
         unsigned char previous_client_finished_len;