diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 3fa8f5039f..579c005cc3 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.87 2014/10/18 16:13:16 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.88 2014/10/31 14:51:01 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 | * |
@@ -1931,7 +1931,7 @@ void | |||
1931 | ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | 1931 | ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) |
1932 | { | 1932 | { |
1933 | CERT_PKEY *cpk; | 1933 | CERT_PKEY *cpk; |
1934 | int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dsa_sign; | 1934 | int rsa_enc, rsa_sign, dh_tmp, dsa_sign; |
1935 | unsigned long mask_k, mask_a; | 1935 | unsigned long mask_k, mask_a; |
1936 | int have_ecc_cert, ecdh_ok, ecdsa_ok; | 1936 | int have_ecc_cert, ecdh_ok, ecdsa_ok; |
1937 | int have_ecdh_tmp; | 1937 | int have_ecdh_tmp; |
@@ -1942,7 +1942,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
1942 | if (c == NULL) | 1942 | if (c == NULL) |
1943 | return; | 1943 | return; |
1944 | 1944 | ||
1945 | rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); | ||
1946 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); | 1945 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); |
1947 | 1946 | ||
1948 | have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL || | 1947 | have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL || |
@@ -1970,7 +1969,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
1970 | mask_a |= SSL_aGOST94; | 1969 | mask_a |= SSL_aGOST94; |
1971 | } | 1970 | } |
1972 | 1971 | ||
1973 | if (rsa_enc || (rsa_tmp && rsa_sign)) | 1972 | if (rsa_enc) |
1974 | mask_k|=SSL_kRSA; | 1973 | mask_k|=SSL_kRSA; |
1975 | 1974 | ||
1976 | if (dh_tmp) | 1975 | if (dh_tmp) |