Bug 1261699 - Cipher suite is uint16_t, a=bustage

3 files changed, 3 insertions, 3 deletions

diff --git a/external_tests/ssl_gtest/ssl_loopback_unittest.cc b/external_tests/ssl_gtest/ssl_loopback_unittest.cc
index 60a7f81eb..c5b0174af 100644
--- a/external_tests/ssl_gtest/ssl_loopback_unittest.cc
+++ b/external_tests/ssl_gtest/ssl_loopback_unittest.cc
@@ -126,7 +126,7 @@ class TlsChaCha20Poly1305Test : public TlsConnectTls12 {
     SendReceive();
 
     // Check that we used the right cipher suite.
-    int16_t actual, expected = static_cast<int16_t>(cipher_suite);
+    uint16_t actual, expected = static_cast<int16_t>(cipher_suite);
     EXPECT_TRUE(client_->cipher_suite(&actual) && actual == expected);
     EXPECT_TRUE(server_->cipher_suite(&actual) && actual == expected);
   }
diff --git a/external_tests/ssl_gtest/tls_agent.h b/external_tests/ssl_gtest/tls_agent.h
index 2dbe8a334..ee4368217 100644
--- a/external_tests/ssl_gtest/tls_agent.h
+++ b/external_tests/ssl_gtest/tls_agent.h
@@ -142,7 +142,7 @@ class TlsAgent : public PollTarget {
     return info_.protocolVersion;
   }
 
-  bool cipher_suite(int16_t* cipher_suite) const {
+  bool cipher_suite(uint16_t* cipher_suite) const {
     if (state_ != STATE_CONNECTED) return false;
 
     *cipher_suite = info_.cipherSuite;
diff --git a/external_tests/ssl_gtest/tls_connect.cc b/external_tests/ssl_gtest/tls_connect.cc
index 38e90e550..103da7ec7 100644
--- a/external_tests/ssl_gtest/tls_connect.cc
+++ b/external_tests/ssl_gtest/tls_connect.cc
@@ -229,7 +229,7 @@ void TlsConnectTestBase::CheckConnected() {
   EXPECT_EQ(TlsAgent::STATE_CONNECTED, client_->state());
   EXPECT_EQ(TlsAgent::STATE_CONNECTED, server_->state());
 
-  int16_t cipher_suite1, cipher_suite2;
+  uint16_t cipher_suite1, cipher_suite2;
   bool ret = client_->cipher_suite(&cipher_suite1);
   EXPECT_TRUE(ret);
   ret = server_->cipher_suite(&cipher_suite2);