| Index: net/android/keystore.h
|
| diff --git a/net/android/keystore.h b/net/android/keystore.h
|
| index ac3babe2a2a5b23605872c078864d124911a187b..50dce6813db34c8df55d052acb4fb4e6ad2dc0a6 100644
|
| --- a/net/android/keystore.h
|
| +++ b/net/android/keystore.h
|
| @@ -27,7 +27,7 @@ namespace android {
|
| // values are shared with Java through org.chromium.net.PrivateKeyType.
|
| // Example: PRIVATE_KEY_TYPE_RSA.
|
| enum PrivateKeyType {
|
| -#define DEFINE_PRIVATE_KEY_TYPE(name,value) PRIVATE_KEY_TYPE_ ## name = value,
|
| +#define DEFINE_PRIVATE_KEY_TYPE(name, value) PRIVATE_KEY_TYPE_##name = value,
|
| #include "net/android/private_key_type_list.h"
|
| #undef DEFINE_PRIVATE_KEY_TYPE
|
| };
|
| @@ -50,8 +50,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>* q);
|
|
|
| // Returns the order parameter of a given ECPrivateKey platform object,
|
| // as a series of bytes, in big-endian representation. This can be used
|
| @@ -60,8 +59,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>* 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
|
| @@ -81,11 +79,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>* signature);
|
|
|
| // Return the PrivateKeyType of a given private key.
|
| // |private_key| is a JNI reference for the private key.
|
|
|