summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 0f05b8f2fe..f728eb7648 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_lib.c,v 1.141 2017/05/06 20:37:24 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.142 2017/05/06 22:24:57 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2504,7 +2504,7 @@ ssl3_get_req_cert_type(SSL *s, unsigned char *p)
2504 int ret = 0; 2504 int ret = 0;
2505 unsigned long alg_k; 2505 unsigned long alg_k;
2506 2506
2507 alg_k = S3I(s)->tmp.new_cipher->algorithm_mkey; 2507 alg_k = S3I(s)->hs.new_cipher->algorithm_mkey;
2508 2508
2509#ifndef OPENSSL_NO_GOST 2509#ifndef OPENSSL_NO_GOST
2510 if ((alg_k & SSL_kGOST)) { 2510 if ((alg_k & SSL_kGOST)) {
@@ -2720,7 +2720,7 @@ ssl3_renegotiate_check(SSL *s)
2720long 2720long
2721ssl_get_algorithm2(SSL *s) 2721ssl_get_algorithm2(SSL *s)
2722{ 2722{
2723 long alg2 = S3I(s)->tmp.new_cipher->algorithm2; 2723 long alg2 = S3I(s)->hs.new_cipher->algorithm2;
2724 2724
2725 if (s->method->internal->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF && 2725 if (s->method->internal->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF &&
2726 alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF)) 2726 alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))