Insulate the legacy Android client auth code from OpenSSL ABI changes.

net/android/keystore.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.h"
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 106 matching lines @@
 
 PrivateKeyType GetPrivateKeyType(jobject private_key_ref) {
   JNIEnv* env = AttachCurrentThread();
   int type = Java_AndroidKeyStore_getPrivateKeyType(
       env,
       GetKeyStore(private_key_ref).obj(),
       private_key_ref);
   return static_cast<PrivateKeyType>(type);
 }
 
-EVP_PKEY* GetOpenSSLSystemHandleForPrivateKey(jobject private_key_ref) {
+AndroidEVP_PKEY* GetOpenSSLSystemHandleForPrivateKey(jobject private_key_ref) {
   JNIEnv* env = AttachCurrentThread();
   // Note: the pointer is passed as a jint here because that's how it
   // is stored in the Java object. Java doesn't have a primitive type
   // like intptr_t that matches the size of pointers on the host
   // machine, and Android only runs on 32-bit CPUs.
   //
   // Given that this routine shall only be called on Android < 4.2,
   // 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);
-  return reinterpret_cast<EVP_PKEY*>(pkey);
+  return reinterpret_cast<AndroidEVP_PKEY*>(pkey);
+}
+
+ScopedJavaLocalRef<jobject> GetOpenSSLEngineForPrivateKey(
+    jobject private_key_ref) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> engine =
+      Java_AndroidKeyStore_getOpenSSLEngineForPrivateKey(
+          env,
+          GetKeyStore(private_key_ref).obj(),
+          private_key_ref);
+  return engine;
 }
 
 void ReleaseKey(jobject private_key_ref) {
   JNIEnv* env = AttachCurrentThread();
   Java_AndroidKeyStore_releaseKey(env,
                                   GetKeyStore(private_key_ref).obj(),
                                   private_key_ref);
   env->DeleteGlobalRef(private_key_ref);
 }
 
 bool RegisterKeyStore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace net