diff options
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/ocsp')
5 files changed, 15 insertions, 26 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java index e14fe29..f5a3581 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java @@ -9,7 +9,6 @@ import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1TaggedObject; -import org.bouncycastle.asn1.DERGeneralizedTime; import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.DERTaggedObject; @@ -39,7 +38,7 @@ public class CrlID crlNum = ASN1Integer.getInstance(o, true); break; case 2: - crlTime = DERGeneralizedTime.getInstance(o, true); + crlTime = ASN1GeneralizedTime.getInstance(o, true); break; default: throw new IllegalArgumentException( diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java index f8ea8f7..577e413 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java @@ -3,7 +3,7 @@ package org.bouncycastle.asn1.ocsp; import org.bouncycastle.asn1.ASN1ObjectIdentifier; /** - * OIDs for <a href="http://tools.ietf.org/html/rfc2560">RFC 2560</a> + * OIDs for <a href="http://tools.ietf.org/html/rfc2560">RFC 2560</a> and <a href="http://tools.ietf.org/html/rfc6960">RFC 6960</a> * Online Certificate Status Protocol - OCSP. */ public interface OCSPObjectIdentifiers @@ -26,4 +26,9 @@ public interface OCSPObjectIdentifiers static final ASN1ObjectIdentifier id_pkix_ocsp_archive_cutoff = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.6"); /** OID: 1.3.6.1.5.5.7.48.1.7 */ static final ASN1ObjectIdentifier id_pkix_ocsp_service_locator = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.7"); + + + static final ASN1ObjectIdentifier id_pkix_ocsp_pref_sig_algs = id_pkix_ocsp.branch("8"); + + static final ASN1ObjectIdentifier id_pkix_ocsp_extended_revoke = id_pkix_ocsp.branch("9"); } diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java index e2a9f95..6874b22 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java @@ -7,7 +7,6 @@ import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1TaggedObject; -import org.bouncycastle.asn1.DERGeneralizedTime; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.DERTaggedObject; import org.bouncycastle.asn1.x509.Extensions; @@ -49,7 +48,7 @@ public class ResponseData */ public ResponseData( ResponderID responderID, - DERGeneralizedTime producedAt, + ASN1GeneralizedTime producedAt, ASN1Sequence responses, X509Extensions responseExtensions) { diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java index ca5a5c4..0dc2a91 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java @@ -6,7 +6,6 @@ import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1TaggedObject; -import org.bouncycastle.asn1.DERGeneralizedTime; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.DERTaggedObject; import org.bouncycastle.asn1.x509.Extensions; @@ -32,31 +31,13 @@ public class SingleResponse public SingleResponse( CertID certID, CertStatus certStatus, - DERGeneralizedTime thisUpdate, - DERGeneralizedTime nextUpdate, + ASN1GeneralizedTime thisUpdate, + ASN1GeneralizedTime nextUpdate, X509Extensions singleExtensions) { this(certID, certStatus, thisUpdate, nextUpdate, Extensions.getInstance(singleExtensions)); } - /** - * @deprecated use method taking ASN1GeneralizedTime and Extensions - * @param certID - * @param certStatus - * @param thisUpdate - * @param nextUpdate - * @param singleExtensions - */ - public SingleResponse( - CertID certID, - CertStatus certStatus, - DERGeneralizedTime thisUpdate, - DERGeneralizedTime nextUpdate, - Extensions singleExtensions) - { - this(certID, certStatus, ASN1GeneralizedTime.getInstance(thisUpdate), ASN1GeneralizedTime.getInstance(nextUpdate), Extensions.getInstance(singleExtensions)); - } - public SingleResponse( CertID certID, CertStatus certStatus, diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html new file mode 100644 index 0000000..22c560d --- /dev/null +++ b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html @@ -0,0 +1,5 @@ +<html> +<body bgcolor="#ffffff"> +Support classes useful for encoding and supporting OCSP objects. +</body> +</html> |