Switch to standard integer types in crypto/.

crypto/encryptor.h

 // Copyright (c) 2012 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.
 
 #ifndef CRYPTO_ENCRYPTOR_H_
 #define CRYPTO_ENCRYPTOR_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 
 #if !defined(USE_OPENSSL)
 #include "crypto/scoped_nss_types.h"
 #endif
 
 namespace crypto {
@@ skipping 19 matching lines @@
 
     // Write the content of the counter to |buf|. |buf| should have enough
     // space for |GetLengthInBytes()|.
     void Write(void* buf);
 
     // Return the length of this counter.
     size_t GetLengthInBytes() const;
 
    private:
     union {
-      uint32 components32[4];
-      uint64 components64[2];
+      uint32_t components32[4];
+      uint64_t components64[2];
     } counter_;
   };
 
   Encryptor();
   virtual ~Encryptor();
 
   // Initializes the encryptor using |key| and |iv|. Returns false if either the
   // key or the initialization vector cannot be used.
   //
   // If |mode| is CBC, |iv| must not be empty; if it is CTR, then |iv| must be
@@ skipping 30 matching lines @@
   // Make sure there's enough space in mask when calling this method.
   // Reserve at least |plaintext_len| + 16 bytes for |mask|.
   //
   // The generated mask will always have at least |plaintext_len| bytes and
   // will be a multiple of the counter length.
   //
   // This method is used only in CTR mode.
   //
   // Returns false if this call failed.
   bool GenerateCounterMask(size_t plaintext_len,
-                           uint8* mask,
+                           uint8_t* mask,
                            size_t* mask_len);
 
   // Mask the |plaintext| message using |mask|. The output will be written to
   // |ciphertext|. |ciphertext| must have at least |plaintext_len| bytes.
   void MaskMessage(const void* plaintext,
                    size_t plaintext_len,
                    const void* mask,
                    void* ciphertext) const;
 
   SymmetricKey* key_;
@@ skipping 15 matching lines @@
   bool CryptCTR(PK11Context* context,
                 const base::StringPiece& input,
                 std::string* output);
   ScopedSECItem param_;
 #endif
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_ENCRYPTOR_H_