Switch to standard integer types in net/.

net/http/des.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/http/des.h"
 
 #include "base/logging.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/des.h>
@@ skipping 38 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Set odd parity bit (in least significant bit position).
-static uint8 DESSetKeyParity(uint8 x) {
+static uint8_t DESSetKeyParity(uint8_t x) {
   if ((((x >> 7) ^ (x >> 6) ^ (x >> 5) ^
         (x >> 4) ^ (x >> 3) ^ (x >> 2) ^
         (x >> 1)) & 0x01) == 0) {
     x |= 0x01;
   } else {
     x &= 0xfe;
   }
   return x;
 }
 
 namespace net {
 
-void DESMakeKey(const uint8* raw, uint8* key) {
+void DESMakeKey(const uint8_t* raw, uint8_t* key) {
   key[0] = DESSetKeyParity(raw[0]);
   key[1] = DESSetKeyParity((raw[0] << 7) | (raw[1] >> 1));
   key[2] = DESSetKeyParity((raw[1] << 6) | (raw[2] >> 2));
   key[3] = DESSetKeyParity((raw[2] << 5) | (raw[3] >> 3));
   key[4] = DESSetKeyParity((raw[3] << 4) | (raw[4] >> 4));
   key[5] = DESSetKeyParity((raw[4] << 3) | (raw[5] >> 5));
   key[6] = DESSetKeyParity((raw[5] << 2) | (raw[6] >> 6));
   key[7] = DESSetKeyParity((raw[6] << 1));
 }
 
 #if defined(USE_OPENSSL)
 
-void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) {
+void DESEncrypt(const uint8_t* key, const uint8_t* src, uint8_t* hash) {
   crypto::EnsureOpenSSLInit();
 
   DES_key_schedule ks;
   DES_set_key(
       reinterpret_cast<const DES_cblock*>(key), &ks);
 
   DES_ecb_encrypt(reinterpret_cast<const DES_cblock*>(src),
                   reinterpret_cast<DES_cblock*>(hash), &ks, DES_ENCRYPT);
 }
 
 #elif defined(OS_IOS)
 
-void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) {
+void DESEncrypt(const uint8_t* key, const uint8_t* src, uint8_t* hash) {
   CCCryptorStatus status;
   size_t data_out_moved = 0;
   status = CCCrypt(kCCEncrypt, kCCAlgorithmDES, kCCOptionECBMode,
                    key, 8, NULL, src, 8, hash, 8, &data_out_moved);
   DCHECK(status == kCCSuccess);
   DCHECK(data_out_moved == 8);
 }
 
 #endif
 
 }  // namespace net