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

Track change to Conscrypt

Browse Source 
(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
Download Patch File Download Diff File Expand all files Collapse all files

11
keystore/java/android/security/AndroidKeyPairGenerator.java
View File

@@ -17,7 +17,6 @@
package android.security;
import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;
import com.android.org.conscrypt.NativeCrypto;
import com.android.org.conscrypt.OpenSSLEngine;
@@ -34,7 +33,6 @@ import java.security.SecureRandom;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.RSAKeyGenParameterSpec;
import java.security.spec.X509EncodedKeySpec;
@@ -156,8 +154,6 @@ public class AndroidKeyPairGenerator extends KeyPairGeneratorSpi {
private static String getDefaultSignatureAlgorithmForKeyType(String keyType) {
if ("RSA".equalsIgnoreCase(keyType)) {
return "sha256WithRSA";
} else if ("DSA".equalsIgnoreCase(keyType)) {
return "sha1WithDSA";
} else if ("EC".equalsIgnoreCase(keyType)) {
return "sha256WithECDSA";
} else {
@@ -173,13 +169,6 @@ public class AndroidKeyPairGenerator extends KeyPairGeneratorSpi {
return new byte[][] { rsaSpec.getPublicExponent().toByteArray() };
}
break;
case NativeCrypto.EVP_PKEY_DSA:
if (spec instanceof DSAParameterSpec) {
DSAParameterSpec dsaSpec = (DSAParameterSpec) spec;
return new byte[][] { dsaSpec.getG().toByteArray(),
dsaSpec.getP().toByteArray(), dsaSpec.getQ().toByteArray() };
}
break;
}
return null;
}