summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <>2014-07-12 13:11:53 +0000
committerjsing <>2014-07-12 13:11:53 +0000
commitf369cbd2df9afb8ac061dda10793999764e0368b (patch)
treedd77c44528a0b25f7964c067da56be1302be9ee2 /src/lib/libssl/ssl_lib.c
parente38eced5b24c9ac14880daf6256db41e61f7b6ac (diff)
downloadopenbsd-f369cbd2df9afb8ac061dda10793999764e0368b.tar.gz
openbsd-f369cbd2df9afb8ac061dda10793999764e0368b.tar.bz2
openbsd-f369cbd2df9afb8ac061dda10793999764e0368b.zip
Remove remnants from PSK, KRB5 and SRP.
ok beck@ miod@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index c3169204f6..beb8089475 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.74 2014/07/11 09:24:44 beck Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.75 2014/07/12 13:11:53 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 *
@@ -2137,9 +2137,6 @@ ssl_get_server_send_pkey(const SSL *s)
2137 i = SSL_PKEY_RSA_SIGN; 2137 i = SSL_PKEY_RSA_SIGN;
2138 else 2138 else
2139 i = SSL_PKEY_RSA_ENC; 2139 i = SSL_PKEY_RSA_ENC;
2140 } else if (alg_a & SSL_aKRB5) {
2141 /* VRS something else here? */
2142 return (NULL);
2143 } else if (alg_a & SSL_aGOST94) { 2140 } else if (alg_a & SSL_aGOST94) {
2144 i = SSL_PKEY_GOST94; 2141 i = SSL_PKEY_GOST94;
2145 } else if (alg_a & SSL_aGOST01) { 2142 } else if (alg_a & SSL_aGOST01) {