diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index bd5f9f6da1..f6a21d4351 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.84 2014/09/07 12:16:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.85 2014/10/03 13:58:18 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 | * |
@@ -1943,7 +1943,8 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
1943 | rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); | 1943 | rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); |
1944 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); | 1944 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); |
1945 | 1945 | ||
1946 | have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL); | 1946 | have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL || |
1947 | c->ecdh_tmp_auto != 0); | ||
1947 | cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]); | 1948 | cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]); |
1948 | rsa_enc = (cpk->x509 != NULL && cpk->privatekey != NULL); | 1949 | rsa_enc = (cpk->x509 != NULL && cpk->privatekey != NULL); |
1949 | cpk = &(c->pkeys[SSL_PKEY_RSA_SIGN]); | 1950 | cpk = &(c->pkeys[SSL_PKEY_RSA_SIGN]); |