diff options
| author | David Benjamin <davidben@chromium.org> | 2014-12-12 23:55:27 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-14 02:22:21 +0300 |
| commit | 82c9e90a5860bd93851cf7399bea3fc5bd03cdf2 (patch) | |
| tree | 81dff00a59a777078d6883ff0d7b6b520e8f200c /ssl/t1_enc.c | |
| parent | 4b755cb0da7aace30815164ef2e13031707f6b7f (diff) | |
Merge SSLv23_method and DTLS_ANY_VERSION.
This makes SSLv23_method go through DTLS_ANY_VERSION's version negotiation
logic. This allows us to get rid of duplicate ClientHello logic. For
compatibility, SSL_METHOD is now split into SSL_PROTOCOL_METHOD and a version.
The legacy version-locked methods set min_version and max_version based this
version field to emulate the original semantics.
As a bonus, we can now handle fragmented ClientHello versions now.
Because SSLv23_method is a silly name, deprecate that too and introduce
TLS_method.
Change-Id: I8b3df2b427ae34c44ecf972f466ad64dc3dbb171
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 05f2ecae..af8dc831 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -687,7 +687,7 @@ printf("\nkey block\n"); { int z; for (z=0; z<num; z++) printf("%02X%c",p1[z],((z+1)%16)?' ':'\n'); } #endif - if (s->method->version <= TLS1_VERSION && + if (!SSL_USE_EXPLICIT_IV(s) && (s->mode & SSL_MODE_CBC_RECORD_SPLITTING) != 0) { /* enable vulnerability countermeasure for CBC ciphers with |