Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: net/android/keystore.h

Issue 1158923005: Use the exact-width integer types defined in <stdint.h> rather than (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak comments. Exclude mime_sniffer*. Rebase. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/android/keystore.h
diff --git a/net/android/keystore.h b/net/android/keystore.h
index 827422910ea40b8f1c2cbd0b32f636a1fd156742..1186ef6dd4e6abf17a94def01fa0a79f1592ae06 100644
--- a/net/android/keystore.h
+++ b/net/android/keystore.h
@@ -6,12 +6,12 @@
#define NET_ANDROID_KEYSTORE_H
#include <jni.h>
+#include <stdint.h>
#include <string>
#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
#include "base/strings/string_piece.h"
#include "net/base/net_export.h"
#include "net/ssl/ssl_client_cert_type.h"
@@ -45,7 +45,7 @@ enum PrivateKeyType {
// Returns true on success, or false on failure (e.g. if the key
// is not RSA).
NET_EXPORT bool GetRSAKeyModulus(jobject private_key,
- std::vector<uint8>* modulus);
+ std::vector<uint8_t>* modulus);
// Returns the Q parameter of a given DSAPrivateKey platform object,
// as a series of bytes, in big-endian representation. This can be used
@@ -54,8 +54,7 @@ NET_EXPORT bool GetRSAKeyModulus(jobject private_key,
// |q| will receive the result bytes on success.
// Returns true on success, or false on failure (e.g. if the key is
// not DSA).
-NET_EXPORT bool GetDSAKeyParamQ(jobject private_key,
- std::vector<uint8>* q);
+NET_EXPORT bool GetDSAKeyParamQ(jobject private_key, std::vector<uint8_t>* q);
// Returns the order parameter of a given ECPrivateKey platform object,
// as a series of bytes, in big-endian representation. This can be used
@@ -64,8 +63,7 @@ NET_EXPORT bool GetDSAKeyParamQ(jobject private_key,
// |order| will receive the result bytes on success.
// Returns true on success, or false on failure (e.g. if the key is
// not EC).
-bool GetECKeyOrder(jobject private_key,
- std::vector<uint8>* order);
+bool GetECKeyOrder(jobject private_key, std::vector<uint8_t>* order);
// Returns the encoded PKCS#8 representation of a private key.
// This only works on Android 4.0.3 and older releases for platform keys
@@ -74,7 +72,7 @@ bool GetECKeyOrder(jobject private_key,
// |encoded| will receive the encoded data on success.
// Returns true on success, or false on failure (e.g. on 4.0.4 or higher).
bool GetPrivateKeyEncodedBytes(jobject private_key,
- std::vector<uint8>* encoded);
+ std::vector<uint8_t>* encoded);
// Compute the signature of a given message, which is actually a hash,
// using a private key. For more details, please read the comments for the
@@ -85,11 +83,9 @@ bool GetPrivateKeyEncodedBytes(jobject private_key,
// |signature| will receive the signature on success.
// Returns true on success, false on failure.
//
-NET_EXPORT bool RawSignDigestWithPrivateKey(
- jobject private_key,
- const base::StringPiece& digest,
- std::vector<uint8>* signature);
-
+NET_EXPORT bool RawSignDigestWithPrivateKey(jobject private_key,
+ const base::StringPiece& digest,
+ std::vector<uint8_t>* signature);
// Return the PrivateKeyType of a given private key.
// |private_key| is a JNI reference for the private key.

Powered by Google App Engine
This is Rietveld 408576698