From 9f897f3e0351a7db7016d22b864b8b88dfd5ce06 Mon Sep 17 00:00:00 2001 From: Yuuta Liang Date: Wed, 29 Nov 2023 14:47:14 -0800 Subject: Fix association taggings Signed-off-by: Yuuta Liang --- src/main/model/pki/AlgorithmIdentifier.java | 6 +++--- src/main/model/pki/cert/Extension.java | 2 +- src/main/model/pki/cert/TbsCertificate.java | 2 +- src/main/model/pki/crl/CertificateListContent.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/model/pki') diff --git a/src/main/model/pki/AlgorithmIdentifier.java b/src/main/model/pki/AlgorithmIdentifier.java index 4e4fab3..c098846 100644 --- a/src/main/model/pki/AlgorithmIdentifier.java +++ b/src/main/model/pki/AlgorithmIdentifier.java @@ -15,9 +15,9 @@ import java.util.stream.Stream; /** * Implements the following: * 
- *   AttributeTypeAndValue ::= SEQUENCE {
- *       type ATTRIBUTE.&id({SupportedAttributes}),
- *       value ATTRIBUTE.&Type({SupportedAttributes}{@type}) OPTIONAL,
+ *   AlgorithmIdentifier{ALGORITHM:SupportedAlgorithms} ::= SEQUENCE {
+ *       algorithm ALGORITHM.&id({SupportedAlgorithms}),
+ *       parameters ALGORITHM.&Type({SupportedAlgorithms}{@algorithm}) OPTIONAL,
  *   ... }
  *
*/ diff --git a/src/main/model/pki/cert/Extension.java b/src/main/model/pki/cert/Extension.java index a856086..b7d1818 100644 --- a/src/main/model/pki/cert/Extension.java +++ b/src/main/model/pki/cert/Extension.java @@ -39,7 +39,7 @@ public class Extension extends ASN1Object { * behaviour is undefined. * Marking an extension critical reduces compatibility. */ - @Assoc(partOf = true) + @Assoc(partOf = true, lowerBond = 0) private final Bool critical; /** diff --git a/src/main/model/pki/cert/TbsCertificate.java b/src/main/model/pki/cert/TbsCertificate.java index 6ad15e7..6a6c199 100644 --- a/src/main/model/pki/cert/TbsCertificate.java +++ b/src/main/model/pki/cert/TbsCertificate.java @@ -64,7 +64,7 @@ public class TbsCertificate extends ASN1Object { * [0] Version DEFAULT v1 * */ - @Assoc(partOf = true) + @Assoc(partOf = true, lowerBond = 0) private final Int version; /** diff --git a/src/main/model/pki/crl/CertificateListContent.java b/src/main/model/pki/crl/CertificateListContent.java index 80d8fc1..e582623 100644 --- a/src/main/model/pki/crl/CertificateListContent.java +++ b/src/main/model/pki/crl/CertificateListContent.java @@ -39,6 +39,7 @@ import java.util.stream.Stream; * Because the CA will only generate CRLs, this object won't be parsed. */ public class CertificateListContent extends ASN1Object { + @Assoc(partOf = true) private final Int version = new Int(Int.TAG, null, 1); @Assoc(partOf = true) private final Name issuer; @@ -46,7 +47,7 @@ public class CertificateListContent extends ASN1Object { private final AlgorithmIdentifier signature; @Assoc(partOf = true) private final ASN1Time thisUpdate; - @Assoc(partOf = true) + @Assoc(partOf = true, lowerBond = 0) private final ASN1Time nextUpdate; @Assoc(partOf = true, lowerBond = 0) private final RevokedCertificate[] revokedCertificates; -- cgit v1.2.3