diff options
| author | neel <neel@FreeBSD.org> | 2014-10-19 23:05:18 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2014-10-19 23:05:18 +0000 |
| commit | 53c23ba9a2104ef3682a2b22cb1ab9269ca0745d (patch) | |
| tree | 5660ad82f8ccde1ac8cad42c5caa05dc307f1c94 /crypto/openssl/ssl/s2_lib.c | |
| parent | 13e9198693c3c4ccfd604fbab375f3b96aa149dc (diff) | |
| parent | 0486efbb500e4ad95f421a2b8786764022256893 (diff) | |
| download | FreeBSD-src-53c23ba9a2104ef3682a2b22cb1ab9269ca0745d.zip FreeBSD-src-53c23ba9a2104ef3682a2b22cb1ab9269ca0745d.tar.gz | |
IFC @r273206
Diffstat (limited to 'crypto/openssl/ssl/s2_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_lib.c b/crypto/openssl/ssl/s2_lib.c index c0bdae5..c63be30 100644 --- a/crypto/openssl/ssl/s2_lib.c +++ b/crypto/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; |
