Refactoring AndroidKeyStore to support a KeyStore running in another process

net/android/keystore_openssl.cc

 // Copyright (c) 2013 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/android/keystore_openssl.h"
 
 #include <jni.h>
 #include <openssl/bn.h>
 // This include is required to get the ECDSA_METHOD structure definition
 // which isn't currently part of the OpenSSL official ABI. This should
@@ skipping 190 matching lines @@
 int RsaMethodInit(RSA* rsa) {
   return 0;
 }
 
 int RsaMethodFinish(RSA* rsa) {
   // Ensure the global JNI reference created with this wrapper is
   // properly destroyed with it.
   jobject key = reinterpret_cast<jobject>(RSA_get_app_data(rsa));
   if (key != NULL) {
     RSA_set_app_data(rsa, NULL);
-    JNIEnv* env = base::android::AttachCurrentThread();
-    env->DeleteGlobalRef(key);
+    ReleaseKey(key);
   }
   // Actual return value is ignored by OpenSSL. There are no docs
   // explaining what this is supposed to be.
   return 0;
 }
 
 const RSA_METHOD android_rsa_method = {
   /* .name = */ "Android signing-only RSA method",
   /* .rsa_pub_enc = */ RsaMethodPubEnc,
   /* .rsa_pub_dec = */ RsaMethodPubDec,
@@ skipping 183 matching lines @@
   DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_INVALID_DIGEST_TYPE);
   return -1;
 }
 
 int DsaMethodFinish(DSA* dsa) {
   // Free the global JNI reference that was created with this
   // wrapper key.
   jobject key = reinterpret_cast<jobject>(DSA_get_ex_data(dsa,0));
   if (key != NULL) {
     DSA_set_ex_data(dsa, 0, NULL);
-    JNIEnv* env = base::android::AttachCurrentThread();
-    env->DeleteGlobalRef(key);
+    ReleaseKey(key);
   }
   // Actual return value is ignored by OpenSSL. There are no docs
   // explaining what this is supposed to be.
   return 0;
 }
 
 const DSA_METHOD android_dsa_method = {
   /* .name = */ "Android signing-only DSA method",
   /* .dsa_do_sign = */ DsaMethodDoSign,
   /* .dsa_sign_setup = */ DsaMethodSignSetup,
@@ skipping 58 matching lines @@
                 void* ptr,
                 CRYPTO_EX_DATA* ad,
                 int idx,
                 long argl,
                 void* argp) {
   jobject private_key = reinterpret_cast<jobject>(ptr);
   if (private_key == NULL)
     return;
 
   CRYPTO_set_ex_data(ad, idx, NULL);
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  env->DeleteGlobalRef(private_key);
+  ReleaseKey(private_key);
 }
 
 int ExDataDup(CRYPTO_EX_DATA* to,
               CRYPTO_EX_DATA* from,
               void* from_d,
               int idx,
               long argl,
               void* argp) {
   // This callback shall never be called with the current OpenSSL
   // implementation (the library only ever duplicates EX_DATA items
@@ skipping 182 matching lines @@
     default:
       LOG(WARNING)
           << "GetOpenSSLPrivateKeyWrapper() called with invalid key type";
       return NULL;
   }
   return pkey.release();
 }
 
 }  // namespace android
 }  // namespace net