diff options
Diffstat (limited to 'net/android/javatests/src/org')
| -rw-r--r-- | net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java index ab832c9..865b1ef 100644 --- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java +++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java @@ -21,6 +21,7 @@ public class AndroidKeyStoreTestUtil { private static final String TAG = "AndroidKeyStoreTestUtil"; + private static final DefaultAndroidKeyStore sKeyStore = new DefaultAndroidKeyStore(); /** * Called from native code to create a PrivateKey object from its * encoded PKCS#8 representation. @@ -28,7 +29,7 @@ public class AndroidKeyStoreTestUtil { * @return new PrivateKey handle, or null in case of error. */ @CalledByNative - public static PrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) { + public static AndroidPrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) { String algorithm = null; switch (type) { case PrivateKeyType.RSA: @@ -48,7 +49,7 @@ public class AndroidKeyStoreTestUtil { KeyFactory factory = KeyFactory.getInstance(algorithm); KeySpec ks = new PKCS8EncodedKeySpec(encodedKey); PrivateKey key = factory.generatePrivate(ks); - return key; + return sKeyStore.createKey(key); } catch (NoSuchAlgorithmException e) { Log.e(TAG, "Could not create " + algorithm + " factory instance!"); |