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/test | |
| 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/test')
| -rw-r--r-- | ssl/test/bssl_shim.cc | 2 | ||||
| -rw-r--r-- | ssl/test/runner/runner.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index 3d78c1cc..6266ad16 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc @@ -231,7 +231,7 @@ static SSL_CTX *setup_ctx(const TestConfig *config) { SSL_CTX *ssl_ctx = NULL; DH *dh = NULL; - ssl_ctx = SSL_CTX_new(config->is_dtls ? DTLS_method() : SSLv23_method()); + ssl_ctx = SSL_CTX_new(config->is_dtls ? DTLS_method() : TLS_method()); if (ssl_ctx == NULL) { goto err; } diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index e3bf338a..3cfc92de 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go @@ -445,8 +445,7 @@ var testCases = []testCase{ FragmentClientVersion: true, }, }, - shouldFail: true, - expectedError: ":RECORD_TOO_SMALL:", + expectedVersion: VersionTLS12, }, { testType: serverTest, |