summaryrefslogtreecommitdiffstats
path: root/ssl/d1_pkt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-09-17 18:10:37 +0100
committerDr. Stephen Henson <steve@openssl.org>2013-09-17 18:55:41 +0100
commit40088d8b8190a2a33828a769c23bf35de542c7dc (patch)
treecd9676bee8d3b82dd869c59ce956ae9b9c32e0a5 /ssl/d1_pkt.c
parent7d3ba88a984899ef3ba6c96d6ef785874a7ae34e (diff)
DTLS version usage fixes.
Make DTLS behave like TLS when negotiating version: record layer has DTLS 1.0, message version is 1.2. Tolerate different version numbers if version hasn't been negotiated yet.
Diffstat (limited to 'ssl/d1_pkt.c')
-rw-r--r--ssl/d1_pkt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 39587039aa..aefd85d0c3 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1557,9 +1557,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len,
* we haven't decided which version to use yet send back using
* version 1.0 header: otherwise some clients will ignore it.
*/
- if (s->state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B
- && s->method->version == DTLS_ANY_VERSION
- && s->client_version == DTLS1_VERSION)
+ if (s->method->version == DTLS_ANY_VERSION)
{
*(p++)=DTLS1_VERSION>>8;
*(p++)=DTLS1_VERSION&0xff;