Commit b452f433 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1751 

Submitted by: David Woodhouse <dwmw2@infradead.org>
Approved by: steve@openssl.org

Compatibility patches for Cisco VPN client DTLS.
parent 52891f83

ssl/d1_both.c

+13 −4
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ int dtls1_do_write(SSL *s, int type) 
				const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;

				int xlen;



				if (frag_off == 0)

				if (frag_off == 0 && s->version != DTLS1_BAD_VER)

					{

					/* reconstruct message header is if it

					 * is being sent in single fragment */
@@ -407,8 +407,10 @@ long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) 
			s2n (msg_hdr->seq,p);

			l2n3(0,p);

			l2n3(msg_len,p);

			if (s->version != DTLS1_BAD_VER) {

				p       -= DTLS1_HM_HEADER_LENGTH;

				msg_len += DTLS1_HM_HEADER_LENGTH;

			}



			ssl3_finish_mac(s, p, msg_len);

			if (s->msg_callback)
@@ -775,6 +777,13 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b) 
		*p++=SSL3_MT_CCS;

		s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;

		s->init_num=DTLS1_CCS_HEADER_LENGTH;



		if (s->version == DTLS1_BAD_VER) {

			s->d1->next_handshake_write_seq++;

			s2n(s->d1->handshake_write_seq,p);

			s->init_num+=2;

		}



		s->init_off=0;



		dtls1_set_message_header_int(s, SSL3_MT_CCS, 0,
@@ -989,7 +998,7 @@ dtls1_buffer_message(SSL *s, int is_ccs) 
	if ( is_ccs)

		{

		OPENSSL_assert(s->d1->w_msg_hdr.msg_len + 

			DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);

			       ((s->version==DTLS1_VERSION)?DTLS1_CCS_HEADER_LENGTH:3) == (unsigned int)s->init_num);

		}

	else

		{

ssl/d1_clnt.c

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int dtls1_get_hello_verify(SSL *s); 


static const SSL_METHOD *dtls1_get_client_method(int ver)

	{

	if (ver == DTLS1_VERSION)

	if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)

		return(DTLSv1_client_method());

	else

		return(NULL);
@@ -181,7 +181,8 @@ int dtls1_connect(SSL *s) 
			s->server=0;

			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);



			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))

			if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) &&

			    (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00))

				{

				SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);

				ret = -1;

ssl/d1_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ void dtls1_free(SSL *s) 
void dtls1_clear(SSL *s)

	{

	ssl3_clear(s);

	if (s->options & SSL_OP_CISCO_ANYCONNECT)

		s->version=DTLS1_BAD_VER;

	else

		s->version=DTLS1_VERSION;

	}

ssl/d1_pkt.c

+10 −4
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ again: 
				}

			}



		if ((version & 0xff00) != (DTLS1_VERSION & 0xff00))

		if ((version & 0xff00) != (s->version & 0xff00))

			{

			SSLerr(SSL_F_DTLS1_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);

			goto err;
@@ -1067,13 +1067,17 @@ start: 
	if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)

		{

		struct ccs_header_st ccs_hdr;

		int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;



		dtls1_get_ccs_header(rr->data, &ccs_hdr);



		if (s->version == DTLS1_BAD_VER)

			ccs_hdr_len = 3;



		/* 'Change Cipher Spec' is just a single byte, so we know

		 * exactly what the record payload has to look like */

		/* XDTLS: check that epoch is consistent */

		if (	(rr->length != DTLS1_CCS_HEADER_LENGTH) || 

		if (	(rr->length != ccs_hdr_len) || 

			(rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))

			{

			i=SSL_AD_ILLEGAL_PARAMETER;
@@ -1094,6 +1098,9 @@ start: 
		/* do this whenever CCS is processed */

		dtls1_reset_seq_numbers(s, SSL3_CC_READ);



		if (s->version == DTLS1_BAD_VER)

			s->d1->handshake_read_seq++;



		goto start;

		}
@@ -1401,7 +1408,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len, 
#if 0

	/* 'create_empty_fragment' is true only when this function calls itself */

	if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done

		&& SSL_version(s) != DTLS1_VERSION)

	    && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)

		{

		/* countermeasure against known-IV weakness in CBC ciphersuites

		 * (see http://www.openssl.org/~bodo/tls-cbc.txt)
@@ -1428,7 +1435,6 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len, 
		s->s3->empty_fragment_done = 1;

		}

#endif



	p = wb->buf + prefix_len;



	/* write the header */

ssl/d1_srvr.c

+2 −1
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ int dtls1_accept(SSL *s) 
			s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A;



			/* HelloVerifyRequest resets Finished MAC */

			if (s->version != DTLS1_BAD_VER)

				ssl3_init_finished_mac(s);

			break;