diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-12 13:11:54 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-12 13:11:54 +0000 |
| commit | 68604b897713ece762fa7e3516b76ce6b919eda0 (patch) | |
| tree | 5e3aba6dec9a536d85ae1cad4e94f4c167e7492b /lib/libssl/d1_clnt.c | |
| parent | 88314c75cf872ad59638cf1ec83d8e21bf72def5 (diff) | |
Remove remnants from PSK, KRB5 and SRP.
ok beck@ miod@
Diffstat (limited to 'lib/libssl/d1_clnt.c')
| -rw-r--r-- | lib/libssl/d1_clnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c index b85908c7330..004fd6e04f5 100644 --- a/lib/libssl/d1_clnt.c +++ b/lib/libssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.29 2014/07/11 22:57:25 miod Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.30 2014/07/12 13:11:53 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -395,9 +395,9 @@ dtls1_connect(SSL *s) s->init_num = 0; break; } - /* Check if it is anon DH or PSK */ - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) && - !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { + /* Check if it is anon DH. */ + if (!(s->s3->tmp.new_cipher->algorithm_auth & + SSL_aNULL)) { ret = ssl3_get_server_certificate(s); if (ret <= 0) goto end; |