commit e7c4d04aed7fbb6400ec91607803139751411f97
author Jerome Poichet <jpoichet@google.com> Fri Mar 20 21:44:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 20 21:44:09 2015 +0000
tree 43530ffb6d12253c1153ff6d343eba92549b4d94
parent 8e47158fabd5bad4282644c6e9ed9ac99c603e33
parent 5304090b17fb5c07091e8573047fb7e8bf2699a7

am 5304090b: Fixing build after bouncycastle upgrade to 1.51

* commit '5304090b17fb5c07091e8573047fb7e8bf2699a7':
  Fixing build after bouncycastle upgrade to 1.51

java/src/com/google/polo/ssl/SslUtil.java

diff --git a/java/src/com/google/polo/ssl/SslUtil.java b/java/src/com/google/polo/ssl/SslUtil.java
index 3d092b3..e575770 100644
--- a/java/src/com/google/polo/ssl/SslUtil.java
+++ b/java/src/com/google/polo/ssl/SslUtil.java
@@ -25,13 +25,13 @@
 import org.bouncycastle.asn1.x509.GeneralNames;
 import org.bouncycastle.asn1.x509.KeyPurposeId;
 import org.bouncycastle.asn1.x509.KeyUsage;
+import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x509.X509Extensions;
 import org.bouncycastle.asn1.x509.X509Name;
 import org.bouncycastle.x509.X509V1CertificateGenerator;
 import org.bouncycastle.x509.X509V3CertificateGenerator;
 import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -178,7 +178,7 @@
     certGen.addExtension(X509Extensions.AuthorityKeyIdentifier, true,
         authIdentifier);
     certGen.addExtension(X509Extensions.SubjectKeyIdentifier, true,
-        new SubjectKeyIdentifierStructure(pair.getPublic()));
+            SubjectKeyIdentifier.getInstance(pair.getPublic().getEncoded()));
 
     certGen.addExtension(X509Extensions.SubjectAlternativeName, false, new GeneralNames(
         new GeneralName(GeneralName.rfc822Name, "android-tv-remote-support@google.com")));