summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2014-08-07 10:32:20 -0700
committerKenny Root <kroot@google.com>2014-08-07 10:32:22 -0700
commit0c177196b9d46449b6accb826e5f1d787f98298e (patch)
tree93043e00a73b278d52717c88b8e6b7a256d4dbb0 /luni
parent6c17caabccd492226c50605929a0eb9e044cb7dc (diff)
downloadlibcore-0c177196b9d46449b6accb826e5f1d787f98298e.zip
libcore-0c177196b9d46449b6accb826e5f1d787f98298e.tar.gz
libcore-0c177196b9d46449b6accb826e5f1d787f98298e.tar.bz2
Track bouncycastle upgrade to 1.51
The SubjectKeyIdentifierStructure class is no longer in Bouncycastle. Change-Id: Ie5eb91a14ec38f773ef22754d77651a161fd7122
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);