diff options
| author | Adam Langley <agl@google.com> | 2015-04-23 17:29:56 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-04-24 18:26:59 +0000 |
| commit | d8eaa8b9e9911a0d3539917fb8134e3b19205a3e (patch) | |
| tree | 971faaa67bb040e2fc9cb228e2ba87e2ae81f3d3 /src/ssl | |
| parent | d82ab38ca2b63638a2cb0b5d8a2c76d90c86dd31 (diff) | |
| download | external_boringssl-d8eaa8b9e9911a0d3539917fb8134e3b19205a3e.zip external_boringssl-d8eaa8b9e9911a0d3539917fb8134e3b19205a3e.tar.gz external_boringssl-d8eaa8b9e9911a0d3539917fb8134e3b19205a3e.tar.bz2 | |
Use SSL_MODE_SEND_FALLBACK_SCSV.
Upstream settled in this API, and it's also the one that we expect
internally and that third_party code will expect.
This is an import of upstream's
5f0efe06e199a1bd96f161eb45f3dd76924cdc2a.
Change-Id: Ib4c7054a382dccdd23919407742bd037b9653a4b
Diffstat (limited to 'src/ssl')
| -rw-r--r-- | src/ssl/s3_lib.c | 5 | ||||
| -rw-r--r-- | src/ssl/ssl_lib.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/ssl/s3_lib.c b/src/ssl/s3_lib.c index 9782296..d33a4c2 100644 --- a/src/ssl/s3_lib.c +++ b/src/ssl/s3_lib.c @@ -967,11 +967,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) { memcpy(parg, s->s3->tlsext_channel_id, larg < 64 ? larg : 64); return 64; - case SSL_CTRL_FALLBACK_SCSV: - s->fallback_scsv = 1; - ret = 1; - break; - default: break; } diff --git a/src/ssl/ssl_lib.c b/src/ssl/ssl_lib.c index c3b95d5..35eb1ec 100644 --- a/src/ssl/ssl_lib.c +++ b/src/ssl/ssl_lib.c @@ -1425,7 +1425,7 @@ int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, uint8_t *p) { s2n(SSL3_CK_SCSV & 0xffff, p); } - if (s->fallback_scsv) { + if (s->mode & SSL_MODE_SEND_FALLBACK_SCSV) { s2n(SSL3_CK_FALLBACK_SCSV & 0xffff, p); } |