diff options
| author | EKR <ekr@rtfm.com> | 2017-08-10 08:50:24 +1000 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2017-08-10 08:50:24 +1000 |
| commit | 47b6b269acc868b901bf737414277f5fe0bcb27a (patch) | |
| tree | 31da35f45a84a24aa13d30e1c59fd0838ba94574 /gtests/ssl_gtest/ssl_skip_unittest.cc | |
| parent | 4f161a318bf27027c032591ac40e3c97edc39d62 (diff) | |
| download | nss-hg-47b6b269acc868b901bf737414277f5fe0bcb27a.tar.gz | |
Bug 1304604 - Send client-side handshake alerts with handshake keys, r=mt
Differential Revision: https://nss-review.dev.mozaws.net/D397
Diffstat (limited to 'gtests/ssl_gtest/ssl_skip_unittest.cc')
| -rw-r--r-- | gtests/ssl_gtest/ssl_skip_unittest.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gtests/ssl_gtest/ssl_skip_unittest.cc b/gtests/ssl_gtest/ssl_skip_unittest.cc index cb65a1087..4c9ff3d21 100644 --- a/gtests/ssl_gtest/ssl_skip_unittest.cc +++ b/gtests/ssl_gtest/ssl_skip_unittest.cc @@ -101,19 +101,10 @@ class Tls13SkipTest : public TlsConnectTestBase, void ServerSkipTest(std::shared_ptr<TlsRecordFilter> filter, int32_t error) { EnsureTlsSetup(); server_->SetTlsRecordFilter(filter); - client_->ExpectSendAlert(kTlsAlertUnexpectedMessage); - if (variant_ == ssl_variant_stream) { - server_->ExpectSendAlert(kTlsAlertBadRecordMac); - ConnectExpectFail(); - } else { - ConnectExpectFailOneSide(TlsAgent::CLIENT); - } + ExpectAlert(client_, kTlsAlertUnexpectedMessage); + ConnectExpectFail(); client_->CheckErrorCode(error); - if (variant_ == ssl_variant_stream) { - server_->CheckErrorCode(SSL_ERROR_BAD_MAC_READ); - } else { - ASSERT_EQ(TlsAgent::STATE_CONNECTING, server_->state()); - } + server_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT); } void ClientSkipTest(std::shared_ptr<TlsRecordFilter> filter, int32_t error) { |