diff options
| author | Matt Caswell <matt@openssl.org> | 2018-07-18 18:05:49 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-08-15 14:33:30 +0300 |
| commit | 35e742ecac9239539db016e1282b4cbdf501509c (patch) | |
| tree | 69505449d87cb5902f7db623738266782bb98ac2 /test | |
| parent | 58094ab60ff51918a248dc6bd977d48f981fe2c1 (diff) | |
Update code for the final RFC version of TLSv1.3 (RFC8446)
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6741)
Diffstat (limited to 'test')
| -rw-r--r-- | test/asynciotest.c | 4 | ||||
| -rw-r--r-- | test/recipes/70-test_sslcertstatus.t | 2 | ||||
| -rw-r--r-- | test/recipes/70-test_sslversions.t | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/test/asynciotest.c b/test/asynciotest.c index 73e415fdd3..5e85cbb044 100644 --- a/test/asynciotest.c +++ b/test/asynciotest.c @@ -227,11 +227,9 @@ static int async_write(BIO *bio, const char *in, int inl) /* * We can't fragment anything after the ServerHello (or CCS <= * TLS1.2), otherwise we get a bad record MAC - * TODO(TLS1.3): Change TLS1_3_VERSION_DRAFT to TLS1_3_VERSION - * before release */ if (contenttype == SSL3_RT_CHANGE_CIPHER_SPEC - || (negversion == TLS1_3_VERSION_DRAFT + || (negversion == TLS1_3_VERSION && msgtype == SSL3_MT_SERVER_HELLO)) { fragment = 0; break; diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index f66d343578..6fd89feaf7 100644 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -40,8 +40,6 @@ my $proxy = TLSProxy::Proxy->new( #Test 1: Sending a status_request extension in both ClientHello and #ServerHello but then omitting the CertificateStatus message is valid -#TODO(TLS1.3): Temporarily disabling this test in TLS1.3 until we've completed -#the move the status request extension to the Certificate message. $proxy->clientflags("-status -no_tls1_3"); $proxy->start() or plan skip_all => "Unable to start up Proxy for tests"; plan tests => 1; diff --git a/test/recipes/70-test_sslversions.t b/test/recipes/70-test_sslversions.t index 8ef85af7a9..b0342740d3 100644 --- a/test/recipes/70-test_sslversions.t +++ b/test/recipes/70-test_sslversions.t @@ -145,8 +145,7 @@ sub modify_supported_versions_filter $ext = pack "C5", 0x04, # Length 0x03, 0x03, #TLSv1.2 - #TODO(TLS1.3): Fix before release - 0x7f, 0x1c; #TLSv1.3 (draft 28) + 0x03, 0x04; #TLSv1.3 } elsif ($testtype == UNRECOGNISED_VERSIONS) { $ext = pack "C5", 0x04, # Length @@ -160,8 +159,7 @@ sub modify_supported_versions_filter } elsif ($testtype == WITH_TLS1_4) { $ext = pack "C5", 0x04, # Length - #TODO(TLS1.3): Fix before release - 0x7f, 0x1c; #TLSv1.3 (draft 28) + 0x03, 0x04; #TLSv1.3 } if ($testtype == REVERSE_ORDER_VERSIONS || $testtype == UNRECOGNISED_VERSIONS |