diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 21:19:20 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 21:19:20 +0100 |
commit | b9107e03cbb02e73f61e2105df4d5de9d2c6ab52 (patch) | |
tree | 2e7b3d1017b49e6eac5c09a733c3a63e03a4b562 /bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java | |
parent | fb958eec615d74410d4d26b20aeeb632479884e0 (diff) | |
parent | 57c3bb556ef873a72010d6022edddc14e6bba9be (diff) | |
download | android_external_bouncycastle-b9107e03cbb02e73f61e2105df4d5de9d2c6ab52.tar.gz android_external_bouncycastle-b9107e03cbb02e73f61e2105df4d5de9d2c6ab52.tar.bz2 android_external_bouncycastle-b9107e03cbb02e73f61e2105df4d5de9d2c6ab52.zip |
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
Android 4.3 release 2.1
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java index 379120e..50a714c 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java @@ -16,7 +16,6 @@ import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.DERInteger; -import org.bouncycastle.asn1.DERObjectIdentifier; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; import org.bouncycastle.asn1.x509.DSAParameter; @@ -57,7 +56,7 @@ public class JDKDSAPrivateKey PrivateKeyInfo info) throws IOException { - DSAParameter params = new DSAParameter((ASN1Sequence)info.getAlgorithmId().getParameters()); + DSAParameter params = DSAParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters()); DERInteger derX = ASN1Integer.getInstance(info.parsePrivateKey()); this.x = derX.getValue(); @@ -146,7 +145,7 @@ public class JDKDSAPrivateKey } public ASN1Encodable getBagAttribute( - DERObjectIdentifier oid) + ASN1ObjectIdentifier oid) { return attrCarrier.getBagAttribute(oid); } |