am c869ac1b: am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection."
* commit 'c869ac1b7d163282ffdebf4ce9b32c479766f52d':
Obtain SPI without using Reflection.
diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java
index a7c2ddb..a26530c 100644
--- a/keystore/java/android/security/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/AndroidKeyStoreProvider.java
@@ -16,7 +16,6 @@
package android.security;
-import java.lang.reflect.Method;
import java.security.Provider;
import javax.crypto.Cipher;
@@ -92,23 +91,17 @@
if (cryptoPrimitive == null) {
throw new NullPointerException();
}
- if ((!(cryptoPrimitive instanceof Mac)) && (!(cryptoPrimitive instanceof Cipher))) {
- throw new IllegalArgumentException("Unsupported crypto primitive: " + cryptoPrimitive);
- }
Object spi;
- // TODO: Replace this Reflection based codewith direct invocations once the libcore changes
- // are in.
- try {
- Method getSpiMethod = cryptoPrimitive.getClass().getDeclaredMethod("getSpi");
- getSpiMethod.setAccessible(true);
- spi = getSpiMethod.invoke(cryptoPrimitive);
- } catch (ReflectiveOperationException e) {
- throw new IllegalArgumentException(
- "Unsupported crypto primitive: " + cryptoPrimitive, e);
+ if (cryptoPrimitive instanceof Mac) {
+ spi = ((Mac) cryptoPrimitive).getSpi();
+ } else if (cryptoPrimitive instanceof Cipher) {
+ spi = ((Cipher) cryptoPrimitive).getSpi();
+ } else {
+ throw new IllegalArgumentException("Unsupported crypto primitive: " + cryptoPrimitive);
}
if (!(spi instanceof KeyStoreCryptoOperation)) {
throw new IllegalArgumentException(
- "Crypto primitive not backed by Android KeyStore: " + cryptoPrimitive
+ "Crypto primitive not backed by AndroidKeyStore: " + cryptoPrimitive
+ ", spi: " + spi);
}
return ((KeyStoreCryptoOperation) spi).getOperationHandle();