diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-28 22:02:16 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-28 22:02:16 +0000 |
commit | 5d577d7eb0f6cd2432b60e6abececc6f7c9bbb79 (patch) | |
tree | 7fd5dcc6d3842bfe00a6c19d8b968a9728b8bf8a | |
parent | 05ee0523c1de4e74c49d5631fd4233f1f841af29 (diff) |
Update from 1.0.0-stable.
-rw-r--r-- | ssl/t1_lib.c | 8 |
1 files changed, 8 insertions, 0 deletions
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 ... */ |