diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-04-06 16:50:12 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-04-09 15:02:48 +0200 |
| commit | c6913eeb762edffddecaaba5c84909d7a7962927 (patch) | |
| tree | a57c3c33e23b846852f00ec4681c6fdeccf8ea85 /ssl/d1_clnt.c | |
| parent | Set s->d1 to NULL after freeing it. (diff) | |
| download | openssl-c6913eeb762edffddecaaba5c84909d7a7962927.tar.xz openssl-c6913eeb762edffddecaaba5c84909d7a7962927.zip | |
Dual DTLS version methods.
Add new methods DTLS_*_method() which support both DTLS 1.0 and DTLS 1.2 and
pick the highest version the peer supports during negotiation.
As with SSL/TLS options can change this behaviour specifically
SSL_OP_NO_DTLSv1 and SSL_OP_NO_DTLSv1_2.
Diffstat (limited to 'ssl/d1_clnt.c')
| -rw-r--r-- | ssl/d1_clnt.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index ec7ef0d817..40acbb756b 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -155,6 +155,13 @@ IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, dtls1_get_client_method, DTLSv1_2_enc_data) +IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, + DTLS_client_method, + ssl_undefined_function, + dtls1_connect, + dtls1_get_client_method, + DTLSv1_2_enc_data) + int dtls1_connect(SSL *s) { BUF_MEM *buf=NULL; @@ -785,12 +792,14 @@ static int dtls1_get_hello_verify(SSL *s) unsigned char *data; unsigned int cookie_len; + s->first_packet = 1; n=s->method->ssl_get_message(s, DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A, DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B, -1, s->max_cert_list, &ok); + s->first_packet = 0; if (!ok) return((int)n); @@ -802,14 +811,16 @@ static int dtls1_get_hello_verify(SSL *s) } data = (unsigned char *)s->init_msg; - - if ((data[0] != (s->version>>8)) || (data[1] != (s->version&0xff))) +#if 0 + if (s->method->version != DTLS_ANY_VERSION && + ((data[0] != (s->version>>8)) || (data[1] != (s->version&0xff)))) { SSLerr(SSL_F_DTLS1_GET_HELLO_VERIFY,SSL_R_WRONG_SSL_VERSION); s->version=(s->version&0xff00)|data[1]; al = SSL_AD_PROTOCOL_VERSION; goto f_err; } +#endif data+=2; cookie_len = *(data++); |