Switch to standard integer types in net/.

net/ssl/ssl_cipher_suite_names.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_cipher_suite_names.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/ssl.h>
 #endif
 #include <stdlib.h>
@@ skipping 13 matching lines @@
 //   <5 bits> key exchange
 //   <5 bits> cipher
 //   <3 bits> mac
 
 // The following tables were generated by ssl_cipher_suite_names_generate.go,
 // found in the same directory as this file.
 
 namespace {
 
 struct CipherSuite {
-  uint16 cipher_suite, encoded;
+  uint16_t cipher_suite, encoded;
 };
 
 const struct CipherSuite kCipherSuites[] = {
     {0x0, 0x0},        // TLS_NULL_WITH_NULL_NULL
     {0x1, 0x101},      // TLS_RSA_WITH_NULL_MD5
     {0x2, 0x102},      // TLS_RSA_WITH_NULL_SHA
     {0x3, 0x209},      // TLS_RSA_EXPORT_WITH_RC4_40_MD5
     {0x4, 0x111},      // TLS_RSA_WITH_RC4_128_MD5
     {0x5, 0x112},      // TLS_RSA_WITH_RC4_128_SHA
     {0x6, 0x219},      // TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
@@ skipping 225 matching lines @@
 
   if (a->cipher_suite < b->cipher_suite) {
     return -1;
   } else if (a->cipher_suite == b->cipher_suite) {
     return 0;
   } else {
     return 1;
   }
 }
 
-bool GetCipherProperties(uint16 cipher_suite,
+bool GetCipherProperties(uint16_t cipher_suite,
                          int* out_key_exchange,
                          int* out_cipher,
                          int* out_mac) {
   CipherSuite desired = {0};
   desired.cipher_suite = cipher_suite;
   void* r = bsearch(&desired, kCipherSuites, arraysize(kCipherSuites),
                     sizeof(kCipherSuites[0]), CipherSuiteCmp);
 
   if (!r)
     return false;
 
   const CipherSuite* cs = static_cast<const CipherSuite*>(r);
   *out_key_exchange = cs->encoded >> 8;
   *out_cipher = (cs->encoded >> 3) & 0x1f;
   *out_mac = cs->encoded & 0x7;
   return true;
 }
 
 }  // namespace
 
 namespace net {
 
 void SSLCipherSuiteToStrings(const char** key_exchange_str,
                              const char** cipher_str,
                              const char** mac_str,
-                             bool *is_aead,
-                             uint16 cipher_suite) {
+                             bool* is_aead,
+                             uint16_t cipher_suite) {
   *key_exchange_str = *cipher_str = *mac_str = "???";
   *is_aead = false;
 
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return;
 
   *key_exchange_str = kKeyExchangeNames[key_exchange].name;
   *cipher_str = kCipherNames[cipher].name;
   if (mac == kAEADMACValue) {
@@ skipping 25 matching lines @@
       *name = "QUIC";
       break;
     default:
       NOTREACHED() << ssl_version;
       *name = "???";
       break;
   }
 }
 
 bool ParseSSLCipherString(const std::string& cipher_string,
-                          uint16* cipher_suite) {
+                          uint16_t* cipher_suite) {
   int value = 0;
   if (cipher_string.size() == 6 &&
       base::StartsWith(cipher_string, "0x",
                        base::CompareCase::INSENSITIVE_ASCII) &&
       base::HexStringToInt(cipher_string, &value)) {
-    *cipher_suite = static_cast<uint16>(value);
+    *cipher_suite = static_cast<uint16_t>(value);
     return true;
   }
   return false;
 }
 
-bool IsSecureTLSCipherSuite(uint16 cipher_suite) {
+bool IsSecureTLSCipherSuite(uint16_t cipher_suite) {
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return false;
 
   // Only allow ECDHE key exchanges.
   switch (key_exchange) {
     case 14:  // ECDHE_ECDSA
     case 16:  // ECDHE_RSA
       break;
     default:
       return false;
   }
 
   switch (cipher) {
     case 13:  // AES_128_GCM
     case 14:  // AES_256_GCM
     case 17:  // CHACHA20_POLY1305
       break;
     default:
       return false;
   }
 
   // Only AEADs allowed.
   if (mac != kAEADMACValue)
     return false;
 
   return true;
 }
 
-bool IsTLSCipherSuiteAllowedByHTTP2(uint16 cipher_suite) {
+bool IsTLSCipherSuiteAllowedByHTTP2(uint16_t cipher_suite) {
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return false;
 
   // Only allow forward secure key exchanges.
   switch (key_exchange) {
     case 10:  // DHE_RSA
     case 14:  // ECDHE_ECDSA
     case 16:  // ECDHE_RSA
       break;
@@ skipping 10 matching lines @@
       return false;
   }
 
   // Only AEADs allowed.
   if (mac != kAEADMACValue)
     return false;
 
   return true;
 }
 
-const char* ECCurveName(uint16 cipher_suite, int key_exchange_info) {
+const char* ECCurveName(uint16_t cipher_suite, int key_exchange_info) {
 #if defined(USE_OPENSSL)
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return nullptr;
   switch (key_exchange) {
     case 14:  // ECDHE_ECDSA
     case 16:  // ECDHE_RSA
       break;
     default:
       return nullptr;
   }
   return SSL_get_curve_name(key_exchange_info);
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace net