5 files changed, 28 insertions, 0 deletions

diff --git a/src/main/model/pki/cert/Certificate.java b/src/main/model/pki/cert/Certificate.java
index 25499e3..f9d61bb 100644
--- a/src/main/model/pki/cert/Certificate.java
+++ b/src/main/model/pki/cert/Certificate.java
@@ -1,5 +1,6 @@
 package model.pki.cert;
 
+import annotations.Assoc;
 import model.asn1.ASN1Object;
 import model.asn1.BitString;
 import model.asn1.Tag;
@@ -53,16 +54,19 @@ public class Certificate extends ASN1Object {
      * All info of that cert, excluding the signature.
      * It will be signed, and the signature is in <pre>signature</pre>.
      */
+    @Assoc(partOf = true)
     private final TbsCertificate certificate;
 
     /**
      * The algorithm used for <pre>signature</pre>.
      */
+    @Assoc(partOf = true)
     private final AlgorithmIdentifier signatureAlgorithm;
 
     /**
      * The signature.
      */
+    @Assoc(partOf = true)
     private final BitString signature;
 
     /**
diff --git a/src/main/model/pki/cert/Extension.java b/src/main/model/pki/cert/Extension.java
index 9db83b2..a856086 100644
--- a/src/main/model/pki/cert/Extension.java
+++ b/src/main/model/pki/cert/Extension.java
@@ -1,5 +1,6 @@
 package model.pki.cert;
 
+import annotations.Assoc;
 import model.asn1.*;
 import model.asn1.exceptions.ParseException;
 import model.asn1.parsing.BytesReader;
@@ -28,6 +29,7 @@ public class Extension extends ASN1Object {
     /**
      * The ID of the type of that extension.
      */
+    @Assoc(partOf = true)
     private final ObjectIdentifier extnId;
 
     /**
@@ -37,11 +39,13 @@ public class Extension extends ASN1Object {
      * behaviour is undefined.
      * Marking an extension critical reduces compatibility.
      */
+    @Assoc(partOf = true)
     private final Bool critical;
 
     /**
      * The DER-encoded ASN.1 content of that extension.
      */
+    @Assoc(partOf = true)
     private final OctetString extnValue;
 
     /**
diff --git a/src/main/model/pki/cert/Extensions.java b/src/main/model/pki/cert/Extensions.java
index 72d641f..8c636b0 100644
--- a/src/main/model/pki/cert/Extensions.java
+++ b/src/main/model/pki/cert/Extensions.java
@@ -1,5 +1,6 @@
 package model.pki.cert;
 
+import annotations.Assoc;
 import model.asn1.ASN1Object;
 import model.asn1.Encodable;
 import model.asn1.Tag;
@@ -18,6 +19,10 @@ import java.util.stream.Stream;
  * </pre>
  */
 public class Extensions extends ASN1Object {
+    /**
+     * The extension array.
+     */
+    @Assoc(partOf = true)
     private final Extension[] extensions;
 
     /**
diff --git a/src/main/model/pki/cert/TbsCertificate.java b/src/main/model/pki/cert/TbsCertificate.java
index 26b30f4..6ad15e7 100644
--- a/src/main/model/pki/cert/TbsCertificate.java
+++ b/src/main/model/pki/cert/TbsCertificate.java
@@ -1,5 +1,6 @@
 package model.pki.cert;
 
+import annotations.Assoc;
 import model.asn1.ASN1Object;
 import model.asn1.Int;
 import model.asn1.Tag;
@@ -63,6 +64,7 @@ public class TbsCertificate extends ASN1Object {
      *   [0] Version DEFAULT v1
      * </pre>
      */
+    @Assoc(partOf = true)
     private final Int version;
 
     /**
@@ -72,8 +74,10 @@ public class TbsCertificate extends ASN1Object {
      *     CertificateSerialNumber ::= INTEGER
      * </pre>
      */
+    @Assoc(partOf = true)
     private final Int serialNumber;
 
+    @Assoc(partOf = true)
     private final AlgorithmIdentifier signature;
 
     /**
@@ -83,24 +87,32 @@ public class TbsCertificate extends ASN1Object {
      *     subject Name
      * </pre>
      */
+    @Assoc(partOf = true)
     private final Name issuer;
 
     /**
      * The validity period of that certificate.
      * Validity ::= SEQUENCE { notBefore Time, notAfter Time, ... }
      */
+    @Assoc(partOf = true)
     private final Validity validity;
 
     /**
      * See the comments on issuer.
      */
+    @Assoc(partOf = true)
     private final Name subject;
 
+    /**
+     * The public key of the certificate's holder.
+     */
+    @Assoc(partOf = true)
     private final SubjectPublicKeyInfo subjectPublicKeyInfo;
 
     /**
      * [3] Optional.
      */
+    @Assoc(partOf = true, lowerBond = 0)
     private final Extensions extensions;
 
     /**
diff --git a/src/main/model/pki/cert/Validity.java b/src/main/model/pki/cert/Validity.java
index e83d326..190b469 100644
--- a/src/main/model/pki/cert/Validity.java
+++ b/src/main/model/pki/cert/Validity.java
@@ -1,5 +1,6 @@
 package model.pki.cert;
 
+import annotations.Assoc;
 import model.asn1.*;
 import model.asn1.exceptions.ParseException;
 import model.asn1.parsing.BytesReader;
@@ -28,11 +29,13 @@ public class Validity extends ASN1Object {
     /**
      * The certificate is not valid before that time.
      */
+    @Assoc(partOf = true)
     private final ASN1Time notBefore;
 
     /**
      * The certificate is not valid after that time.
      */
+    @Assoc(partOf = true)
     private final ASN1Time notAfter;
 
     /**