diff options
| author | Kenny Root <kroot@google.com> | 2015-03-18 16:54:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 16:54:33 +0000 |
| commit | c3f497ae7d841ea59da6e1ffc9c2c5237149173f (patch) | |
| tree | d0835286eba5053d44ded9a67ee046bfb7592aea /keystore/java/android/security/KeyStore.java | |
| parent | fb9ff42d7401d0a2c58140fe306460852ea51167 (diff) | |
| parent | 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa (diff) | |
am 4ff668d4: Track change to Conscrypt
* commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
Track change to Conscrypt
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 0db8c7725d77..1dbdbfb6685d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -71,8 +71,6 @@ public class KeyStore { static int getKeyTypeForAlgorithm(String keyType) throws IllegalArgumentException { if ("RSA".equalsIgnoreCase(keyType)) { return NativeCrypto.EVP_PKEY_RSA; - } else if ("DSA".equalsIgnoreCase(keyType)) { - return NativeCrypto.EVP_PKEY_DSA; } else if ("EC".equalsIgnoreCase(keyType)) { return NativeCrypto.EVP_PKEY_EC; } else { |