Bring in an SSL_HANDSHAKE structure and commence the great shovelling

ok jsing@, gcc@, regress@

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index a42e414dec..2cb47a215c 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.115 2017/02/07 02:08:38 beck Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.116 2017/05/06 22:24:58 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -998,8 +998,8 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
         unsigned char *ret = p;
         int next_proto_neg_seen;
 
-        alg_a = S3I(s)->tmp.new_cipher->algorithm_auth;
-        alg_k = S3I(s)->tmp.new_cipher->algorithm_mkey;
+        alg_a = S3I(s)->hs.new_cipher->algorithm_auth;
+        alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
         using_ecc = ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA)) &&
             SSI(s)->tlsext_ecpointformatlist != NULL;
 
@@ -1107,8 +1107,8 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
         }
 #endif
 
-        if (((S3I(s)->tmp.new_cipher->id & 0xFFFF) == 0x80 ||
-            (S3I(s)->tmp.new_cipher->id & 0xFFFF) == 0x81) &&
+        if (((S3I(s)->hs.new_cipher->id & 0xFFFF) == 0x80 ||
+            (S3I(s)->hs.new_cipher->id & 0xFFFF) == 0x81) &&
             (SSL_get_options(s) & SSL_OP_CRYPTOPRO_TLSEXT_BUG)) {
                 static const unsigned char cryptopro_ext[36] = {
                         0xfd, 0xe8, /*65000*/
@@ -1986,8 +1986,8 @@ ssl_check_serverhello_tlsext(SSL *s)
          * suite, then if server returns an EC point formats lists extension
          * it must contain uncompressed.
          */
-        unsigned long alg_k = S3I(s)->tmp.new_cipher->algorithm_mkey;
-        unsigned long alg_a = S3I(s)->tmp.new_cipher->algorithm_auth;
+        unsigned long alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
+        unsigned long alg_a = S3I(s)->hs.new_cipher->algorithm_auth;
         if ((s->internal->tlsext_ecpointformatlist != NULL) &&
             (s->internal->tlsext_ecpointformatlist_length > 0) &&
             (SSI(s)->tlsext_ecpointformatlist != NULL) &&