From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 31 May 2011 10:34:43 +0000 (+0000)
Subject: Don't round up partitioned premaster secret length if there is only one
X-Git-Tag: OpenSSL-fips-2_0-rc1~358
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b2047c5c0deb9970016e51ee0ab6a9381ba497c;p=oweals%2Fopenssl.git

Don't round up partitioned premaster secret length if there is only one
digest in use: this caused the PRF to fail for an odd premaster secret
length.
---

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 36128dcf6b..d180bfc95c 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -265,6 +265,8 @@ static int tls1_PRF(long digest_mask,
 		if ((m<<TLS1_PRF_DGST_SHIFT) & digest_mask) count++;
 	}	
 	len=slen/count;
+	if (count == 1)
+		slen = 0;
 	S1=sec;
 	memset(out1,0,olen);
 	for (idx=0;ssl_get_handshake_digest(idx,&m,&md);idx++) {