summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_clnt.c
diff options
context:
space:
mode:
authordoug <>2015-09-12 16:10:08 +0000
committerdoug <>2015-09-12 16:10:08 +0000
commit56a3e20d1e41c02e4afd069925ec512ebb40b905 (patch)
treeecc6c8f80b7c9e9b5057a82b1842ccf8724eb149 /src/lib/libssl/d1_clnt.c
parentefc74c6a34e219450e0cc4dd809c41889209b98d (diff)
downloadopenbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.tar.gz
openbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.tar.bz2
openbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.zip
Remove most of the SSLv3 version checks and a few TLS v1.0.
We can now assume >= TLS v1.0 since SSL2_VERSION, SSL3_VERSION and DTLS1_BAD_VER support was removed. "reads ok" miod@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r--src/lib/libssl/d1_clnt.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 4b02fcf3c4..fd26bb5a1e 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.54 2015/09/12 12:58:15 jsing Exp $ */ 1/* $OpenBSD: d1_clnt.c,v 1.55 2015/09/12 16:10:07 doug 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.
@@ -700,16 +700,8 @@ dtls1_send_client_certificate(SSL *s)
700 if (x509 != NULL) 700 if (x509 != NULL)
701 X509_free(x509); 701 X509_free(x509);
702 EVP_PKEY_free(pkey); 702 EVP_PKEY_free(pkey);
703 if (i == 0) { 703 if (i == 0)
704 if (s->version == SSL3_VERSION) { 704 s->s3->tmp.cert_req = 2;
705 s->s3->tmp.cert_req = 0;
706 ssl3_send_alert(s, SSL3_AL_WARNING,
707 SSL_AD_NO_CERTIFICATE);
708 return (1);
709 } else {
710 s->s3->tmp.cert_req = 2;
711 }
712 }
713 705
714 /* Ok, we have a cert */ 706 /* Ok, we have a cert */
715 s->state = SSL3_ST_CW_CERT_C; 707 s->state = SSL3_ST_CW_CERT_C;