Index: /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/ssl_client.c
===================================================================
--- /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/ssl_client.c	(revision 39190)
+++ /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/ssl_client.c	(working copy)
@@ -419,8 +419,9 @@
 		} while (sp);		
 	}
 
-	if (!sslp->session_cache && sslp->vhost->ver[0] == SSL_VERSION_MAJOR 
-			&& sslp->vhost->ver[1] == INDEX_TLSv13 
+	if (!SSL_RESTARTED(sslp) &&
+	    !sslp->session_cache && sslp->vhost->ver[0] == SSL_VERSION_MAJOR
+			&& sslp->vhost->ver[1] == INDEX_TLSv13
 			&& strstr(sslp->vhost->cipherstr,"TLS")) {
 		return tlsv13_state_c0(sslp);
 	}
Index: /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/tlsv13_client.c
===================================================================
--- /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/tlsv13_client.c	(revision 39190)
+++ /branches/rel_apv_10_7_3/usr/src/sys/click/app/ssl/tlsv13_client.c	(working copy)
@@ -17,6 +17,8 @@
 #include <dev/sslhw_wrap/ssl_hw_common.h>
 #include <click/app/ssl/tlsv13_var.h>
 
+extern int renegotiation_enable;
+
 #define RHOST_SUPPORT_TLS13(sslp) (sslp->vhost->supp_ver[INDEX_TLSv13] == SSL_VER_SUPPORTED)
 #define RHOST_SUPPORT_VER(sslp, ver_index) (sslp->vhost->supp_ver[ver_index] == SSL_VER_SUPPORTED)
 
@@ -1311,8 +1313,9 @@
 		}
 	}
 
-	if(sslp->vhost->flags & SSL_RHOST_SECURE_ERNEG || 
-		sslp->vhost->flags & SSL_RHOST_SECURE_ERNEG_MANDATORY){
+	if(renegotiation_enable == 1 &&
+	   (sslp->vhost->flags & SSL_RHOST_SECURE_ERNEG ||
+	    sslp->vhost->flags & SSL_RHOST_SECURE_ERNEG_MANDATORY)){
 		INTTOLEN2(cp, 0x00ff);
 		cp += 2;
 	}