diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index c49b79df0b..76b2f8a8c4 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.159 2017/05/06 20:37:25 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.160 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 | * |
@@ -2088,7 +2088,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
2088 | int | 2088 | int |
2089 | ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s) | 2089 | ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s) |
2090 | { | 2090 | { |
2091 | const SSL_CIPHER *cs = S3I(s)->tmp.new_cipher; | 2091 | const SSL_CIPHER *cs = S3I(s)->hs.new_cipher; |
2092 | unsigned long alg_a; | 2092 | unsigned long alg_a; |
2093 | 2093 | ||
2094 | alg_a = cs->algorithm_auth; | 2094 | alg_a = cs->algorithm_auth; |
@@ -2116,9 +2116,9 @@ ssl_get_server_send_pkey(const SSL *s) | |||
2116 | int i; | 2116 | int i; |
2117 | 2117 | ||
2118 | c = s->cert; | 2118 | c = s->cert; |
2119 | ssl_set_cert_masks(c, S3I(s)->tmp.new_cipher); | 2119 | ssl_set_cert_masks(c, S3I(s)->hs.new_cipher); |
2120 | 2120 | ||
2121 | alg_a = S3I(s)->tmp.new_cipher->algorithm_auth; | 2121 | alg_a = S3I(s)->hs.new_cipher->algorithm_auth; |
2122 | 2122 | ||
2123 | if (alg_a & SSL_aECDSA) { | 2123 | if (alg_a & SSL_aECDSA) { |
2124 | i = SSL_PKEY_ECC; | 2124 | i = SSL_PKEY_ECC; |
@@ -2189,9 +2189,9 @@ ssl_get_auto_dh(SSL *s) | |||
2189 | 2189 | ||
2190 | if (s->cert->dh_tmp_auto == 2) { | 2190 | if (s->cert->dh_tmp_auto == 2) { |
2191 | keylen = 1024; | 2191 | keylen = 1024; |
2192 | } else if (S3I(s)->tmp.new_cipher->algorithm_auth & SSL_aNULL) { | 2192 | } else if (S3I(s)->hs.new_cipher->algorithm_auth & SSL_aNULL) { |
2193 | keylen = 1024; | 2193 | keylen = 1024; |
2194 | if (S3I(s)->tmp.new_cipher->strength_bits == 256) | 2194 | if (S3I(s)->hs.new_cipher->strength_bits == 256) |
2195 | keylen = 3072; | 2195 | keylen = 3072; |
2196 | } else { | 2196 | } else { |
2197 | if ((cpk = ssl_get_server_send_pkey(s)) == NULL) | 2197 | if ((cpk = ssl_get_server_send_pkey(s)) == NULL) |