summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index a03ee735ad..4369ba587a 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.91 2014/12/10 14:58:56 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.92 2014/12/10 15:36:47 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 *
@@ -2051,11 +2051,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
2051 mask_k |= SSL_kGOST; 2051 mask_k |= SSL_kGOST;
2052 mask_a |= SSL_aGOST01; 2052 mask_a |= SSL_aGOST01;
2053 } 2053 }
2054 cpk = &(c->pkeys[SSL_PKEY_GOST94]);
2055 if (cpk->x509 != NULL && cpk->privatekey !=NULL) {
2056 mask_k |= SSL_kGOST;
2057 mask_a |= SSL_aGOST94;
2058 }
2059 2054
2060 if (rsa_enc) 2055 if (rsa_enc)
2061 mask_k|=SSL_kRSA; 2056 mask_k|=SSL_kRSA;
@@ -2211,8 +2206,6 @@ ssl_get_server_send_pkey(const SSL *s)
2211 i = SSL_PKEY_RSA_SIGN; 2206 i = SSL_PKEY_RSA_SIGN;
2212 else 2207 else
2213 i = SSL_PKEY_RSA_ENC; 2208 i = SSL_PKEY_RSA_ENC;
2214 } else if (alg_a & SSL_aGOST94) {
2215 i = SSL_PKEY_GOST94;
2216 } else if (alg_a & SSL_aGOST01) { 2209 } else if (alg_a & SSL_aGOST01) {
2217 i = SSL_PKEY_GOST01; 2210 i = SSL_PKEY_GOST01;
2218 } else { /* if (alg_a & SSL_aNULL) */ 2211 } else { /* if (alg_a & SSL_aNULL) */