Fix handling of user and CA certificates on Android.

net/android/network_library.cc

 // Copyright (c) 2012 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/network_library.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 46 matching lines @@
       ToJavaByteArray(env, public_key, public_len);
   ScopedJavaLocalRef<jbyteArray> private_array =
       ToJavaByteArray(env, private_key, private_len);
   jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair(env,
       GetApplicationContext(), public_array.obj(), private_array.obj());
   LOG_IF(WARNING, !ret) <<
       "Call to Java_AndroidNetworkLibrary_storeKeyPair failed";
   return ret;
 }
 
+void StoreCertificateOrKeychain(const char* data,
+                                size_t data_len,
+                                bool is_pkcs12) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jbyteArray> data_array =
+      ToJavaByteArray(env, reinterpret_cast<const uint8*>(data), data_len);
+  jboolean ret = Java_AndroidNetworkLibrary_storeCertificateOrKeychain(env,
+      GetApplicationContext(), data_array.obj(), is_pkcs12);
+  LOG_IF(WARNING, !ret) <<
+      "Call to Java_AndroidNetworkLibrary_storeCertificateOrKeychain"
+      " failed";
+  // Intentionally do not return 'ret', there is little the caller can
+  // do in case of failure (the CertInstaller itself will deal with
+  // incorrect data and display the appropriate toast).
+}
+
 bool HaveOnlyLoopbackAddresses() {
   JNIEnv* env = AttachCurrentThread();
   return Java_AndroidNetworkLibrary_haveOnlyLoopbackAddresses(env);
 }
 
 std::string GetNetworkList() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> ret =
       Java_AndroidNetworkLibrary_getNetworkList(env);
   return ConvertJavaStringToUTF8(ret);
@@ skipping 17 matching lines @@
   *result = ConvertJavaStringToUTF8(ret);
   return true;
 }
 
 bool RegisterNetworkLibrary(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace net