summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_clnt.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/d1_clnt.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/d1_clnt.c')
-rw-r--r--src/lib/libssl/d1_clnt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index b85908c733..004fd6e04f 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_clnt.c,v 1.29 2014/07/11 22:57:25 miod Exp $ */ 1/* $OpenBSD: d1_clnt.c,v 1.30 2014/07/12 13:11:53 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -395,9 +395,9 @@ dtls1_connect(SSL *s)
395 s->init_num = 0; 395 s->init_num = 0;
396 break; 396 break;
397 } 397 }
398 /* Check if it is anon DH or PSK */ 398 /* Check if it is anon DH. */
399 if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) && 399 if (!(s->s3->tmp.new_cipher->algorithm_auth &
400 !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { 400 SSL_aNULL)) {
401 ret = ssl3_get_server_certificate(s); 401 ret = ssl3_get_server_certificate(s);
402 if (ret <= 0) 402 if (ret <= 0)
403 goto end; 403 goto end;