diff options
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index a42ac73335..18a4cb64e8 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.127 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.128 2017/01/23 14:35:42 jsing 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 | * |
@@ -2056,7 +2056,7 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) | |||
2056 | return (ret); | 2056 | return (ret); |
2057 | } | 2057 | } |
2058 | ecdh = (EC_KEY *)parg; | 2058 | ecdh = (EC_KEY *)parg; |
2059 | if (!(s->options & SSL_OP_SINGLE_ECDH_USE)) { | 2059 | if (!(s->internal->options & SSL_OP_SINGLE_ECDH_USE)) { |
2060 | if (!EC_KEY_generate_key(ecdh)) { | 2060 | if (!EC_KEY_generate_key(ecdh)) { |
2061 | EC_KEY_free(ecdh); | 2061 | EC_KEY_free(ecdh); |
2062 | SSLerr(SSL_F_SSL3_CTRL, | 2062 | SSLerr(SSL_F_SSL3_CTRL, |
@@ -2243,7 +2243,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
2243 | ERR_R_EC_LIB); | 2243 | ERR_R_EC_LIB); |
2244 | return 0; | 2244 | return 0; |
2245 | } | 2245 | } |
2246 | if (!(ctx->options & SSL_OP_SINGLE_ECDH_USE)) { | 2246 | if (!(ctx->internal->options & SSL_OP_SINGLE_ECDH_USE)) { |
2247 | if (!EC_KEY_generate_key(ecdh)) { | 2247 | if (!EC_KEY_generate_key(ecdh)) { |
2248 | EC_KEY_free(ecdh); | 2248 | EC_KEY_free(ecdh); |
2249 | SSLerr(SSL_F_SSL3_CTX_CTRL, | 2249 | SSLerr(SSL_F_SSL3_CTX_CTRL, |
@@ -2413,7 +2413,7 @@ ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, | |||
2413 | * but would have to pay with the price of sk_SSL_CIPHER_dup(). | 2413 | * but would have to pay with the price of sk_SSL_CIPHER_dup(). |
2414 | */ | 2414 | */ |
2415 | 2415 | ||
2416 | if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) { | 2416 | if (s->internal->options & SSL_OP_CIPHER_SERVER_PREFERENCE) { |
2417 | prio = srvr; | 2417 | prio = srvr; |
2418 | allow = clnt; | 2418 | allow = clnt; |
2419 | } else { | 2419 | } else { |