Commit 49f42ec0 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Respect cookie length set by app_gen_cookie_cb [from HEAD]. 

Submitted by: Alex Lam
parent 91d509f0

ssl/d1_srvr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -631,8 +631,6 @@ int dtls1_send_hello_verify_request(SSL *s) 
			*(p++) = s->version >> 8,

			*(p++) = s->version >> 8,

			*(p++) = s->version & 0xFF;

			*(p++) = s->version & 0xFF;





		*(p++) = (unsigned char) s->d1->cookie_len;



		if (s->ctx->app_gen_cookie_cb != NULL &&

		if (s->ctx->app_gen_cookie_cb != NULL &&

		    s->ctx->app_gen_cookie_cb(s, s->d1->cookie, 

		    s->ctx->app_gen_cookie_cb(s, s->d1->cookie, 

		    &(s->d1->cookie_len)) == 0)

		    &(s->d1->cookie_len)) == 0)
@@ -643,6 +641,7 @@ int dtls1_send_hello_verify_request(SSL *s) 
		/* else the cookie is assumed to have 

		/* else the cookie is assumed to have 

		 * been initialized by the application */

		 * been initialized by the application */





		*(p++) = (unsigned char) s->d1->cookie_len;

		memcpy(p, s->d1->cookie, s->d1->cookie_len);

		memcpy(p, s->d1->cookie, s->d1->cookie_len);

		p += s->d1->cookie_len;

		p += s->d1->cookie_len;

		msg_len = p - msg;

		msg_len = p - msg;