diff options
| author | Bodo Moeller <bodo@openssl.org> | 2014-10-15 04:05:42 +0200 |
|---|---|---|
| committer | Janusz Kozerski <j.kozerski@samsung.com> | 2014-10-20 15:26:05 +0200 |
| commit | 360ea1882d5678330fc111419146d12e2a94d25f (patch) | |
| tree | e7675dff10d8b7dff07579a707585b8e3563b816 /ssl/s2_lib.c | |
| parent | 3b03fe1079c2fec254a8126677e8c0a4f9661a8e (diff) | |
| download | openssl-360ea1882d5678330fc111419146d12e2a94d25f.tar.gz openssl-360ea1882d5678330fc111419146d12e2a94d25f.tar.bz2 openssl-360ea1882d5678330fc111419146d12e2a94d25f.zip | |
Support TLS_FALLBACK_SCSV.
Reviewed-by: Rich Salz <rsalz@openssl.org>
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 c0bdae5..c63be30 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; |