minor refactoring - changed method to setRegInfo, relates to github bcgit#1310.

dghgit · dghgit · commit 44be899070f1 · 2023-01-02T16:38:32.000+11:00
diff --git a/CONTRIBUTORS.html b/CONTRIBUTORS.html
@@ -595,6 +595,7 @@
 <li>Francesco Gini &lt;https://github.com/francesco-gini-privitar&gt; - RadixConverter speed up for SP 800-38G FPE.</li>
 <li>Alexander Falb &lt;https://github.com/elexx&gt; - additional JavaDoc in X509Extensions class.</li>
 <li>Brady Siegel &lt;https://github.com/bmsiegel&gt; - PKCS10CertificationRequest OID comparison fix.</li>
+<li>Andreas Kuehne &lt;https://github.com/kuehne-trustable-de&gt; - addition of regInfo to CRMF request message builder.</li>
 </ul>
 </body>
 </html>
diff --git a/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java b/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java
@@ -50,7 +50,7 @@ public class CertificateRequestMessageBuilder
     private POPOPrivKey popoPrivKey;
     private ASN1Null popRaVerified;
     private PKMACValue agreeMAC;
-    private AttributeTypeAndValue[] attributeTypeAndValues;
+    private AttributeTypeAndValue[] regInfo;
 
     public CertificateRequestMessageBuilder(BigInteger certReqId)
     {
@@ -59,13 +59,13 @@ public CertificateRequestMessageBuilder(BigInteger certReqId)
         this.extGenerator = new ExtensionsGenerator();
         this.templateBuilder = new CertTemplateBuilder();
         this.controls = new ArrayList();
-        this.attributeTypeAndValues = new AttributeTypeAndValue[0];
+        this.regInfo = null;
     }
 
-    public CertificateRequestMessageBuilder setAttributeTypeAndValues(AttributeTypeAndValue[] attributeTypeAndValues) {
-        if( attributeTypeAndValues != null) {
-            this.attributeTypeAndValues = attributeTypeAndValues;
-        }
+    public CertificateRequestMessageBuilder setRegInfo(AttributeTypeAndValue[] regInfo)
+    {
+        this.regInfo = regInfo;
+
         return this;
     }
 
@@ -113,8 +113,7 @@ public CertificateRequestMessageBuilder setSerialNumber(BigInteger serialNumber)
      * Request a validity period for the certificate. Either, but not both, of the date parameters may be null.
      *
      * @param notBeforeDate not before date for certificate requested.
-     * @param notAfterDate not after date for the certificate requested.
-     *
+     * @param notAfterDate  not after date for the certificate requested.
      * @return the current builder.
      */
     public CertificateRequestMessageBuilder setValidity(Date notBeforeDate, Date notAfterDate)
@@ -136,8 +135,8 @@ private Time createTime(Date date)
 
     public CertificateRequestMessageBuilder addExtension(
         ASN1ObjectIdentifier oid,
-        boolean              critical,
-        ASN1Encodable        value)
+        boolean critical,
+        ASN1Encodable value)
         throws CertIOException
     {
         CRMFUtil.addExtension(extGenerator, oid, critical, value);
@@ -147,8 +146,8 @@ public CertificateRequestMessageBuilder addExtension(
 
     public CertificateRequestMessageBuilder addExtension(
         ASN1ObjectIdentifier oid,
-        boolean              critical,
-        byte[]               value)
+        boolean critical,
+        byte[] value)
     {
         extGenerator.addExtension(oid, critical, value);
 
@@ -313,15 +312,15 @@ else if (popoPrivKey != null)
         else if (agreeMAC != null)
         {
             proofOfPossession = new ProofOfPossession(ProofOfPossession.TYPE_KEY_AGREEMENT,
-                    POPOPrivKey.getInstance(new DERTaggedObject(false, POPOPrivKey.agreeMAC, agreeMAC)));
+                POPOPrivKey.getInstance(new DERTaggedObject(false, POPOPrivKey.agreeMAC, agreeMAC)));
 
         }
         else if (popRaVerified != null)
         {
             proofOfPossession = new ProofOfPossession();
         }
 
-        CertReqMsg certReqMsg = new CertReqMsg(request, proofOfPossession, attributeTypeAndValues);
+        CertReqMsg certReqMsg = new CertReqMsg(request, proofOfPossession, regInfo);
 
         return new CertificateRequestMessage(certReqMsg);
     }
diff --git a/pkix/src/test/java/org/bouncycastle/cert/crmf/test/AllTests.java b/pkix/src/test/java/org/bouncycastle/cert/crmf/test/AllTests.java
@@ -153,7 +153,7 @@ public void testBasicMessage()
         TestCase.assertEquals(kp.getPublic(), certReqMsg.getPublicKey());
     }
 
-    public void testBasicMessageWithAttributeTypeAndValue()
+    public void testBasicMessageWithRegInfo()
             throws Exception
     {
         KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
@@ -172,7 +172,7 @@ public void testBasicMessageWithAttributeTypeAndValue()
 
         certReqBuild.setSubject(new X500Principal("CN=Test"))
                 .setPublicKey(kp.getPublic())
-                .setAttributeTypeAndValues(atavArr)
+                .setRegInfo(atavArr)
                 .setProofOfPossessionSigningKeySigner(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(kp.getPrivate()));
 
         JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build()).setProvider(BC);

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public void testBasicMessage()`
`153`	`153`	`TestCase.assertEquals(kp.getPublic(), certReqMsg.getPublicKey());`
`154`	`154`	`}`
`155`	`155`
`156`		`- public void testBasicMessageWithAttributeTypeAndValue()`
	`156`	`+ public void testBasicMessageWithRegInfo()`
`157`	`157`	`throws Exception`
`158`	`158`	`{`
`159`	`159`	`KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);`
`@@ -172,7 +172,7 @@ public void testBasicMessageWithAttributeTypeAndValue()`
`172`	`172`
`173`	`173`	`certReqBuild.setSubject(new X500Principal("CN=Test"))`
`174`	`174`	`.setPublicKey(kp.getPublic())`
`175`		`- .setAttributeTypeAndValues(atavArr)`
	`175`	`+ .setRegInfo(atavArr)`
`176`	`176`	`.setProofOfPossessionSigningKeySigner(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(kp.getPrivate()));`
`177`	`177`
`178`	`178`	`JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build()).setProvider(BC);`