From ec55900fe65a6ecc952fe7b179b1b41f7405e5b3 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 6 Feb 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-02-06

---
 port/devtls.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/port/devtls.c b/port/devtls.c
index b2bbac9d83af3e44606aa7fc426c9a4c150f8f74..65cf843ed75b83082a0c82379d2e19d9e4a8da4c 100644
--- a/port/devtls.c
+++ b/port/devtls.c
@@ -745,11 +745,11 @@ tlsrecread(TlsRec *tr)
 	consume(&tr->unprocessed, header, RecHdrLen);
 	nconsumed = RecHdrLen;
 
-	if(tr->handin == 0 && header[0] & 0x80){
+	if((tr->handin == 0) && (header[0] & 0x80)){
 		/* Cope with an SSL3 ClientHello expressed in SSL2 record format.
 			This is sent by some clients that we must interoperate
 			with, such as Java's JSSE and Microsoft's Internet Explorer. */
-		len = (get16(header) & ~0x8000) - 5;
+		len = (get16(header) & ~0x8000) - 3;
 		type = header[2];
 		ver = get16(header + 3);
 		if(type != SSL2ClientHello || len < 22)
@@ -760,7 +760,8 @@ tlsrecread(TlsRec *tr)
 		len = get16(header+3);
 	}
 	if(ver != tr->version && (tr->verset || ver < MinProtoVersion || ver > MaxProtoVersion))
-		rcvError(tr, EProtocolVersion, "invalid version in record layer");
+		rcvError(tr, EProtocolVersion, "record layer saw ver %x, not %x/%d; %d %d",
+			ver, tr->version, tr->verset, type, len);
 	if(len > MaxRecLen || len < 0)
 		rcvError(tr, ERecordOverflow, "record message too long");
 	ensure(tr, &tr->unprocessed, len);
@@ -898,7 +899,7 @@ tlsrecread(TlsRec *tr)
 			b = padblock(b, 8);
 			b->rp[0] = RHandshake;
 			b->rp[1] = HSSL2ClientHello;
-			put24(&b->rp[2], len);
+			put24(&b->rp[2], len+3);
 			b->rp[5] = SSL2ClientHello;
 			put16(&b->rp[6], ver);
 			qbwrite(tr->handq, b);