diff options
author | Sergio Giro <sgiro@google.com> | 2015-04-21 17:04:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-21 17:04:52 +0000 |
commit | fb93a7697b35e8a059d93e3d1776bc307981fc0e (patch) | |
tree | 35d98bf60cbe7a6487bd0014728eb263e89004bb /bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java | |
parent | b44aff7a3b88138f0070630d467c7527cd90c2f3 (diff) | |
parent | 028ab6e01e3b911024b9b9243e9a0f4ac377c0fa (diff) | |
download | android_external_bouncycastle-fb93a7697b35e8a059d93e3d1776bc307981fc0e.tar.gz android_external_bouncycastle-fb93a7697b35e8a059d93e3d1776bc307981fc0e.tar.bz2 android_external_bouncycastle-fb93a7697b35e8a059d93e3d1776bc307981fc0e.zip |
Merge "bouncycastle: upgrade to version 1.52"
Diffstat (limited to 'bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java')
-rw-r--r-- | bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java index 1081d93..dc61c78 100644 --- a/bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java +++ b/bcpkix/src/main/java/org/bouncycastle/cert/X509CertificateHolder.java @@ -19,11 +19,13 @@ import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import org.bouncycastle.asn1.x509.TBSCertificate; import org.bouncycastle.operator.ContentVerifier; import org.bouncycastle.operator.ContentVerifierProvider; +import org.bouncycastle.util.Encodable; /** * Holding class for an X.509 Certificate structure. */ public class X509CertificateHolder + implements Encodable { private Certificate x509Certificate; private Extensions extensions; @@ -214,7 +216,7 @@ public class X509CertificateHolder /** * Return the underlying ASN.1 structure for the certificate in this holder. * - * @return a X509CertificateStructure object. + * @return a Certificate object. */ public Certificate toASN1Structure() { |