From: Andy Polyakov <appro@openssl.org>
Date: Tue, 9 Oct 2007 19:31:18 +0000 (+0000)
Subject: Respect cookie length set by app_gen_cookie_cb.
X-Git-Tag: OpenSSL_0_9_8k^2~650
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2115c5d17d0619baf1bea2613a29967fdb6b0dd;p=oweals%2Fopenssl.git

Respect cookie length set by app_gen_cookie_cb.

Submitted by: Alex Lam
---

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 14fdcff03b..9401105002 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -627,8 +627,6 @@ int dtls1_send_hello_verify_request(SSL *s)
 		*(p++) = s->version >> 8;
 		*(p++) = s->version & 0xFF;
 
-		*(p++) = (unsigned char) s->d1->cookie_len;
-
 		if (s->ctx->app_gen_cookie_cb != NULL &&
 		    s->ctx->app_gen_cookie_cb(s, s->d1->cookie, 
 			&(s->d1->cookie_len)) == 0)
@@ -639,6 +637,7 @@ int dtls1_send_hello_verify_request(SSL *s)
 		/* else the cookie is assumed to have 
 		 * been initialized by the application */
 
+		*(p++) = (unsigned char) s->d1->cookie_len;
 		memcpy(p, s->d1->cookie, s->d1->cookie_len);
 		p += s->d1->cookie_len;
 		msg_len = p - msg;