diff options
| author | jsing <> | 2015-09-10 17:57:50 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-10 17:57:50 +0000 |
| commit | 6a01e44e5bb9917370be7048957c7d999d847bb6 (patch) | |
| tree | b6e132390b9936d3bc45c6b7e5f7567e5fabce5b /src/lib/libssl/d1_clnt.c | |
| parent | d65ad2c1f2794d3d6f1cd74e64b738ee9904a95b (diff) | |
| download | openbsd-6a01e44e5bb9917370be7048957c7d999d847bb6.tar.gz openbsd-6a01e44e5bb9917370be7048957c7d999d847bb6.tar.bz2 openbsd-6a01e44e5bb9917370be7048957c7d999d847bb6.zip | |
Remove support for DTLS_BAD_VER. We do not support non-standard and
incomplete implementations just so that we can interoperate with products
from vendors who have not bothered to fix things in the last ~10 years.
ok bcook@ miod@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/d1_clnt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 2b736b9243..5a755c3bbe 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.49 2015/09/10 15:56:26 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.50 2015/09/10 17:57:50 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. |
| @@ -171,7 +171,7 @@ DTLSv1_client_method(void) | |||
| 171 | static const SSL_METHOD * | 171 | static const SSL_METHOD * |
| 172 | dtls1_get_client_method(int ver) | 172 | dtls1_get_client_method(int ver) |
| 173 | { | 173 | { |
| 174 | if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER) | 174 | if (ver == DTLS1_VERSION) |
| 175 | return (DTLSv1_client_method()); | 175 | return (DTLSv1_client_method()); |
| 176 | return (NULL); | 176 | return (NULL); |
| 177 | } | 177 | } |
| @@ -214,8 +214,7 @@ dtls1_connect(SSL *s) | |||
| 214 | if (cb != NULL) | 214 | if (cb != NULL) |
| 215 | cb(s, SSL_CB_HANDSHAKE_START, 1); | 215 | cb(s, SSL_CB_HANDSHAKE_START, 1); |
| 216 | 216 | ||
| 217 | if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) && | 217 | if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00)) { |
| 218 | (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00)) { | ||
| 219 | SSLerr(SSL_F_DTLS1_CONNECT, | 218 | SSLerr(SSL_F_DTLS1_CONNECT, |
| 220 | ERR_R_INTERNAL_ERROR); | 219 | ERR_R_INTERNAL_ERROR); |
| 221 | ret = -1; | 220 | ret = -1; |
