Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b292e49b: Merge "Obtain SPI without using Reflection."

Browse Source 
* commit 'b292e49b32fa321e59bf88c68e4c4d8c139645dd':
  Obtain SPI without using Reflection.
This commit is contained in:
Alex Klyubin
2015-04-03 19:33:14 +00:00
committed by Android Git Automerger
parent 511eb66092 b292e49b32
commit ec029e5516
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keystore/java/android/security/AndroidKeyStoreProvider.java
View File

@@ -16,7 +16,6 @@
package android.security; package android.security;
import java.lang.reflect.Method;
import java.security.Provider; import java.security.Provider;
import javax.crypto.Cipher; import javax.crypto.Cipher;
@@ -92,19 +91,13 @@ public class AndroidKeyStoreProvider extends Provider {
if (cryptoPrimitive == null) { if (cryptoPrimitive == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
if ((!(cryptoPrimitive instanceof Mac)) && (!(cryptoPrimitive instanceof Cipher))) {
throw new IllegalArgumentException("Unsupported crypto primitive: " + cryptoPrimitive);
}
Object spi; Object spi;
// TODO: Replace this Reflection based codewith direct invocations once the libcore changes if (cryptoPrimitive instanceof Mac) {
// are in. spi = ((Mac) cryptoPrimitive).getSpi();
try { } else if (cryptoPrimitive instanceof Cipher) {
Method getSpiMethod = cryptoPrimitive.getClass().getDeclaredMethod("getSpi"); spi = ((Cipher) cryptoPrimitive).getSpi();
getSpiMethod.setAccessible(true); } else {
spi = getSpiMethod.invoke(cryptoPrimitive); throw new IllegalArgumentException("Unsupported crypto primitive: " + cryptoPrimitive);
} catch (ReflectiveOperationException e) {
throw new IllegalArgumentException(
"Unsupported crypto primitive: " + cryptoPrimitive, e);
} }
if (!(spi instanceof KeyStoreCryptoOperation)) { if (!(spi instanceof KeyStoreCryptoOperation)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(