Track change to Conscrypt

(cherry picked from commit 9d2d6b6b4b)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
This commit is contained in:
Kenny Root
2014-11-26 09:08:40 -08:00
parent fbd8805cd7
commit 4ff668d47a
4 changed files with 4 additions and 34 deletions

View File

@@ -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 {