From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 28 Apr 2009 22:02:16 +0000 (+0000)
Subject: Update from 1.0.0-stable.
X-Git-Tag: OpenSSL_0_9_8m-beta1~232
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d577d7eb0f6cd2432b60e6abececc6f7c9bbb79;p=oweals%2Fopenssl.git

Update from 1.0.0-stable.
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 9ce726996d..c813729f33 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -133,6 +133,10 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
 	int extdatalen=0;
 	unsigned char *ret = p;
 
+	/* don't add extensions for SSLv3 */
+	if (s->client_version == SSL3_VERSION)
+		return p;
+
 	ret+=2;
 
 	if (ret>=limit) return NULL; /* this really never occurs, but ... */
@@ -251,6 +255,10 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 	int extdatalen=0;
 	unsigned char *ret = p;
 
+	/* don't add extensions for SSLv3 */
+	if (s->version == SSL3_VERSION)
+		return p;
+	
 	ret+=2;
 	if (ret>=limit) return NULL; /* this really never occurs, but ... */