mirror of https://github.com/openssl/openssl.git
Update from 1.0.0-stable.
This commit is contained in:
parent
05ee0523c1
commit
5d577d7eb0
|
|
@ -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 ... */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue