Index: net/android/keystore.cc |
diff --git a/net/android/keystore.cc b/net/android/keystore.cc |
index de36c95489df6885672bca09012ea15977ab9c94..30f983a40d62e5ff94d2df615f940aafe5e59a23 100644 |
--- a/net/android/keystore.cc |
+++ b/net/android/keystore.cc |
@@ -22,15 +22,12 @@ using base::android::JavaArrayOfByteArrayToStringVector; |
namespace net { |
namespace android { |
-bool GetRSAKeyModulus( |
- jobject private_key_ref, |
- std::vector<uint8>* result) { |
+bool GetRSAKeyModulus(jobject private_key_ref, std::vector<uint8>* result) { |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jbyteArray> modulus_ref = |
- Java_AndroidKeyStore_getRSAKeyModulus(env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ Java_AndroidKeyStore_getRSAKeyModulus( |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
if (modulus_ref.is_null()) |
return false; |
@@ -38,15 +35,11 @@ bool GetRSAKeyModulus( |
return true; |
} |
-bool GetDSAKeyParamQ(jobject private_key_ref, |
- std::vector<uint8>* result) { |
+bool GetDSAKeyParamQ(jobject private_key_ref, std::vector<uint8>* result) { |
JNIEnv* env = AttachCurrentThread(); |
- ScopedJavaLocalRef<jbyteArray> q_ref = |
- Java_AndroidKeyStore_getDSAKeyParamQ( |
- env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ ScopedJavaLocalRef<jbyteArray> q_ref = Java_AndroidKeyStore_getDSAKeyParamQ( |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
if (q_ref.is_null()) |
return false; |
@@ -54,15 +47,11 @@ bool GetDSAKeyParamQ(jobject private_key_ref, |
return true; |
} |
-bool GetECKeyOrder(jobject private_key_ref, |
- std::vector<uint8>* result) { |
+bool GetECKeyOrder(jobject private_key_ref, std::vector<uint8>* result) { |
JNIEnv* env = AttachCurrentThread(); |
- ScopedJavaLocalRef<jbyteArray> order_ref = |
- Java_AndroidKeyStore_getECKeyOrder( |
- env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ ScopedJavaLocalRef<jbyteArray> order_ref = Java_AndroidKeyStore_getECKeyOrder( |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
if (order_ref.is_null()) |
return false; |
@@ -77,9 +66,7 @@ bool GetPrivateKeyEncodedBytes(jobject private_key_ref, |
ScopedJavaLocalRef<jbyteArray> encoded_ref = |
Java_AndroidKeyStore_getPrivateKeyEncodedBytes( |
- env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
if (encoded_ref.is_null()) |
return false; |
@@ -87,17 +74,14 @@ bool GetPrivateKeyEncodedBytes(jobject private_key_ref, |
return true; |
} |
-bool RawSignDigestWithPrivateKey( |
- jobject private_key_ref, |
- const base::StringPiece& digest, |
- std::vector<uint8>* signature) { |
+bool RawSignDigestWithPrivateKey(jobject private_key_ref, |
+ const base::StringPiece& digest, |
+ std::vector<uint8>* signature) { |
JNIEnv* env = AttachCurrentThread(); |
// Convert message to byte[] array. |
- ScopedJavaLocalRef<jbyteArray> digest_ref = |
- ToJavaByteArray(env, |
- reinterpret_cast<const uint8*>(digest.data()), |
- digest.length()); |
+ ScopedJavaLocalRef<jbyteArray> digest_ref = ToJavaByteArray( |
+ env, reinterpret_cast<const uint8*>(digest.data()), digest.length()); |
DCHECK(!digest_ref.is_null()); |
// Invoke platform API |
@@ -118,9 +102,7 @@ bool RawSignDigestWithPrivateKey( |
PrivateKeyType GetPrivateKeyType(jobject private_key_ref) { |
JNIEnv* env = AttachCurrentThread(); |
int type = Java_AndroidKeyStore_getPrivateKeyType( |
- env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
return static_cast<PrivateKeyType>(type); |
} |
@@ -135,17 +117,14 @@ EVP_PKEY* GetOpenSSLSystemHandleForPrivateKey(jobject private_key_ref) { |
// this won't be a problem in the far future (e.g. when Android gets |
// ported to 64-bit environments, if ever). |
long pkey = Java_AndroidKeyStore_getOpenSSLHandleForPrivateKey( |
- env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
return reinterpret_cast<EVP_PKEY*>(pkey); |
} |
void ReleaseKey(jobject private_key_ref) { |
JNIEnv* env = AttachCurrentThread(); |
- Java_AndroidKeyStore_releaseKey(env, |
- GetKeyStore(private_key_ref).obj(), |
- private_key_ref); |
+ Java_AndroidKeyStore_releaseKey( |
+ env, GetKeyStore(private_key_ref).obj(), private_key_ref); |
env->DeleteGlobalRef(private_key_ref); |
} |