--- openssl-0.9.7g/ssl/d1_srvr.c	2005-05-10 00:32:27.000000000 -0700
+++ openssl-0.9.7g-bugfixing/ssl/d1_srvr.c	2005-05-10 00:27:21.000000000 -0700
@@ -1018,6 +1018,7 @@
 	STACK_OF(X509_NAME) *sk=NULL;
 	X509_NAME *name;
 	BUF_MEM *buf;
+	unsigned int msg_len;
 
 	if (s->state == SSL3_ST_SW_CERT_REQ_A)
 		{
@@ -1094,7 +1095,10 @@
 		s->init_num += 4;
 #endif
 
-		/* XDTLS:  set message header ? */
+		msg_len = s->init_num - DTLS1_HM_HEADER_LENGTH;
+		dtls1_set_message_header(s, s->init_buf->data, 
+			SSL3_MT_CERTIFICATE_REQUEST, msg_len, 0, msg_len);
+
 		/* buffer the message to handle re-xmits */
 		dtls1_buffer_message(s, 0);