diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:31:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:33:30 +0200 |
| commit | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch) | |
| tree | 6a0005fed0f248559139016a7310add07fcb62df /openssl/ssl/s2_lib.c | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2 vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip | |
Update to openssl-1.0.1j
Diffstat (limited to 'openssl/ssl/s2_lib.c')
| -rw-r--r-- | openssl/ssl/s2_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl/ssl/s2_lib.c b/openssl/ssl/s2_lib.c index c0bdae549..c63be3052 100644 --- a/openssl/ssl/s2_lib.c +++ b/openssl/ssl/s2_lib.c @@ -391,6 +391,8 @@ long ssl2_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_GET_SESSION_REUSED: ret=s->hit; break; + case SSL_CTRL_CHECK_PROTO_VERSION: + return ssl3_ctrl(s, SSL_CTRL_CHECK_PROTO_VERSION, larg, parg); default: break; } @@ -437,7 +439,7 @@ int ssl2_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) if (p != NULL) { l=c->id; - if ((l & 0xff000000) != 0x02000000) return(0); + if ((l & 0xff000000) != 0x02000000 && l != SSL3_CK_FALLBACK_SCSV) return(0); p[0]=((unsigned char)(l>>16L))&0xFF; p[1]=((unsigned char)(l>> 8L))&0xFF; p[2]=((unsigned char)(l ))&0xFF; |