summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2014-08-07 17:33:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-07 09:28:10 +0000
commit8e43bfd153208469676e9c6cd0852df23142cfee (patch)
tree08cc7d44ad2e7b928717fcc6ec2653bb233d0562 /luni
parent11940e20d7967330b369c4d7317294fd45339e59 (diff)
parent0c177196b9d46449b6accb826e5f1d787f98298e (diff)
downloadlibcore-8e43bfd153208469676e9c6cd0852df23142cfee.zip
libcore-8e43bfd153208469676e9c6cd0852df23142cfee.tar.gz
libcore-8e43bfd153208469676e9c6cd0852df23142cfee.tar.bz2
Merge "Track bouncycastle upgrade to 1.51"
Diffstat (limited to 'luni')
-rw-r--r--luni/src/test/java/libcore/java/security/cert/CertificateFactoryTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/test/java/libcore/java/security/cert/CertificateFactoryTest.java b/luni/src/test/java/libcore/java/security/cert/CertificateFactoryTest.java
index e2f21e8..30185d1 100644
--- a/luni/src/test/java/libcore/java/security/cert/CertificateFactoryTest.java
+++ b/luni/src/test/java/libcore/java/security/cert/CertificateFactoryTest.java
@@ -17,10 +17,10 @@
package libcore.java.security.cert;
import com.android.org.bouncycastle.asn1.x509.BasicConstraints;
+import com.android.org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
import com.android.org.bouncycastle.asn1.x509.X509Extensions;
import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;
import com.android.org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import com.android.org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -571,7 +571,7 @@ public class CertificateFactoryTest extends TestCase {
}
certGen.addExtension(X509Extensions.SubjectKeyIdentifier, false,
- new SubjectKeyIdentifierStructure(keyPair.getPublic()));
+ SubjectKeyIdentifier.getInstance(keyPair.getPublic().getEncoded()));
certGen.addExtension(X509Extensions.BasicConstraints, true, basicConstraints);
X509Certificate cert = certGen.generate(caKey);