Fix Android cryptographic key pair storage.

net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

 // 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.
 
 package org.chromium.net;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.security.KeyChain;
 import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CalledByNativeUnchecked;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.URLConnection;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
 
 /**
  * This class implements net utilities required by the net component.
  */
 class AndroidNetworkLibrary {
 
     private static final String TAG = AndroidNetworkLibrary.class.getName();
 
     /**
-     * Stores the key pair into the CertInstaller application.
+     * Stores the key pair through the CertInstaller activity.
+     * @param context: current activity context.

[joth, 2012/10/24 19:40:28]

question: I think native code normally passes over the application not activity
context?

[digit1, 2012/10/25 14:34:32]

That's correct, updated.

+     * @param public_key: The public key bytes as DER-encoded SubjectPublicKeyInfo (X.509)
+     * @param private_key: The private key as DER-encoded PrivateKeyInfo (PKCS#8).
+     * @return: true on success, false on failure.
+     *
+     * Note that failure means that the function could not launch the CertInstaller
+     * activity. Whether the keys are valid or properly installed will be indicated
+     * by the CertInstaller UI itself.
      */
     @CalledByNative
-    static public boolean storeKeyPair(Context context, byte[] public_key, byte[] private_key) {
-        // This is based on android.security.Credentials.install()
-        // TODO(joth): Use KeyChain API instead of hard-coding constants here:
-        // http://crbug.com/124660
+    static public boolean storeKeyPair(Context context,
+                                       byte[] public_key,
+                                       byte[] private_key) {

[joth, 2012/10/24 19:40:28]

nit: java style param wrap is double indent (not alighn with paren) and bunch up
multiple params per line.

[digit1, 2012/10/25 14:34:32]

Done.

+        // TODO(digit): Use KeyChain official extra values to pass the public and private
+        // keys when they're available. The "KEY" and "PKEY" hard-coded constants were taken
+        // from the platform sources, since there are no official KeyChain.EXTRA_XXX definitions
+        // for them. b/5859651
         try {
-            Intent intent = new Intent("android.credentials.INSTALL");
-            intent.setClassName("com.android.certinstaller",
-                    "com.android.certinstaller.CertInstallerMain");
-            intent.putExtra("KEY", private_key);
-            intent.putExtra("PKEY", public_key);
+            Intent intent = KeyChain.createInstallIntent();
+            intent.putExtra("PKEY", private_key);
+            intent.putExtra("KEY", public_key);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
             return true;
         } catch (ActivityNotFoundException e) {
-            Log.w(TAG, "could not store certificate: " + e);
+            Log.w(TAG, "could not store key pair: " + e);
         }
         return false;
     }
 
     /**
      * @return the mime type (if any) that is associated with the file
      *         extension. Returns null if no corresponding mime type exists.
      */
     @CalledByNative
     static public String getMimeTypeFromExtension(String extension) {
@@ skipping 90 matching lines @@
      *             on error initializing the TrustManager or reading the
      *             certChain
      */
     @CalledByNativeUnchecked
     public static boolean verifyServerCertificates(byte[][] certChain, String authType)
             throws CertificateException, KeyStoreException, NoSuchAlgorithmException {
         return X509Util.verifyServerCertificates(certChain, authType);
     }
 
 }