diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
| commit | 58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (patch) | |
| tree | 6195ffd39cd3e0b3d6c711f6531b3e7e13b85b44 /ssl/s2_lib.c | |
| parent | cb6864802ed26a1031701a6a385961592a5cac25 (diff) | |
| download | src-703386536a54c104461842552ed16cf949a419cd.tar.gz src-703386536a54c104461842552ed16cf949a419cd.zip | |
Import OpenSSL 1.0.1j.vendor/openssl/1.0.1j
Diffstat (limited to 'ssl/s2_lib.c')
| -rw-r--r-- | ssl/s2_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index c0bdae549639..c63be3052b28 100644 --- a/ssl/s2_lib.c +++ b/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; |