Refactoring in cms

peterdettman · peterdettman · commit a158bda6cb49 · 2026-01-05T11:56:01.000+07:00
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedDataStreamGenerator.java
@@ -84,10 +84,7 @@ protected OutputStream open(
         BERSequenceGenerator eiGen = new BERSequenceGenerator(authEnvGen.getRawOutputStream());
 
         eiGen.addObject(dataType);
-
-        AlgorithmIdentifier encAlgId = encryptor.getAlgorithmIdentifier();
-
-        eiGen.getRawOutputStream().write(encAlgId.getEncoded());
+        eiGen.addObject(encryptor.getAlgorithmIdentifier());
 
         OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
             eiGen.getRawOutputStream(), 0, true, _bufferSize);
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java
@@ -154,9 +154,7 @@ public OutputStream open(
 
             CMSUtils.addRecipientInfosToGenerator(recipientInfos, authGen, berEncodeRecipientSet);
 
-            AlgorithmIdentifier macAlgId = macCalculator.getAlgorithmIdentifier();
-
-            authGen.getRawOutputStream().write(macAlgId.getEncoded());
+            authGen.addObject(macCalculator.getAlgorithmIdentifier());
 
             if (digestCalculator != null)
             {
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java
@@ -104,10 +104,7 @@ protected OutputStream open(
         BERSequenceGenerator eiGen = new BERSequenceGenerator(envGen.getRawOutputStream());
 
         eiGen.addObject(dataType);
-
-        AlgorithmIdentifier encAlgId = encryptor.getAlgorithmIdentifier();
-
-        eiGen.getRawOutputStream().write(encAlgId.getEncoded());
+        eiGen.addObject(encryptor.getAlgorithmIdentifier());
 
         OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
             eiGen.getRawOutputStream(), 0, false, _bufferSize);
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java
@@ -447,7 +447,7 @@ public static OutputStream replaceSigners(
             digestAlgs.add(HELPER.fixDigestAlgID(signer.getDigestAlgorithmID(), dgstAlgFinder));
         }
         AlgorithmIdentifier[] newDigestAlgIds = (AlgorithmIdentifier[])digestAlgs.toArray(new AlgorithmIdentifier[digestAlgs.size()]);
-        sigGen.getRawOutputStream().write(new DLSet(newDigestAlgIds).getEncoded());
+        sigGen.addObject(new DLSet(newDigestAlgIds));
 
         writeEncapContentInfoToGenerator(signedData, sigGen);
 
@@ -463,7 +463,7 @@ public static OutputStream replaceSigners(
             signerInfos.add(signer.toASN1Structure());
         }
 
-        sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());
+        sigGen.addObject(new DERSet(signerInfos));
 
         sigGen.close();
 
@@ -508,7 +508,7 @@ public static OutputStream replaceCertificatesAndCRLs(
         sigGen.addObject(signedData.getVersion());
 
         // digests
-        sigGen.getRawOutputStream().write(signedData.getDigestAlgorithms().toASN1Primitive().getEncoded());
+        sigGen.addObject(signedData.getDigestAlgorithms());
 
         writeEncapContentInfoToGenerator(signedData, sigGen);
 
@@ -538,7 +538,7 @@ public static OutputStream replaceCertificatesAndCRLs(
 
             if (asn1Certs.size() > 0)
             {
-                sigGen.getRawOutputStream().write(new DERTaggedObject(false, 0, asn1Certs).getEncoded());
+                sigGen.addObject(new DERTaggedObject(false, 0, asn1Certs));
             }
         }
 
@@ -548,11 +548,11 @@ public static OutputStream replaceCertificatesAndCRLs(
 
             if (asn1Crls.size() > 0)
             {
-                sigGen.getRawOutputStream().write(new DERTaggedObject(false, 1, asn1Crls).getEncoded());
+                sigGen.addObject(new DERTaggedObject(false, 1, asn1Crls));
             }
         }
 
-        sigGen.getRawOutputStream().write(signedData.getSignerInfos().toASN1Primitive().getEncoded());
+        sigGen.addObject(signedData.getSignerInfos());
 
         sigGen.close();
 
@@ -573,11 +573,11 @@ static void writeSetToGeneratorTagged(
         {
             if (asn1SetParser instanceof BERSetParser)
             {
-                asn1Gen.getRawOutputStream().write(new BERTaggedObject(false, tagNo, asn1Set).getEncoded());
+                new BERTaggedObject(false, tagNo, asn1Set).encodeTo(asn1Gen.getRawOutputStream());
             }
             else
             {
-                asn1Gen.getRawOutputStream().write(new DERTaggedObject(false, tagNo, asn1Set).getEncoded());
+                new DERTaggedObject(false, tagNo, asn1Set).encodeTo(asn1Gen.getRawOutputStream());
             }
         }
     }
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamEditor.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamEditor.java
@@ -81,13 +81,13 @@ public static OutputStream addDigestAlgorithm(OutputStream out, InputStream orig
         {
             throw new CMSException("unable to find digest algorithm");
         }
-        sigGen.getRawOutputStream().write(new DERSet(digestAlgs).getEncoded());
+        sigGen.addObject(new DERSet(digestAlgs));
 
         CMSSignedDataParser.writeEncapContentInfoToGenerator(signedData, sigGen);
 
         CMSSignedDataParser.writeSetToGeneratorTagged(sigGen, signedData.getCertificates(), 0);
         CMSSignedDataParser.writeSetToGeneratorTagged(sigGen, signedData.getCrls(), 1);
-        sigGen.getRawOutputStream().write(signedData.getSignerInfos().toASN1Primitive().getEncoded());
+        sigGen.addObject(signedData.getSignerInfos());
 
         sigGen.close();
         sGen.close();
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java
@@ -224,8 +224,8 @@ public OutputStream open(
         }
 
 
-        sigGen.getRawOutputStream().write(CMSUtils.convertToDlSet(digestAlgs).getEncoded());
-        
+        sigGen.addObject(CMSUtils.convertToDlSet(digestAlgs));
+
         BERSequenceGenerator eiGen = new BERSequenceGenerator(sigGen.getRawOutputStream());
         eiGen.addObject(eContentType);
 
@@ -456,14 +456,14 @@ public void close()
             {
                 ASN1Set certSet = CMSUtils.createBerSetFromList(certs);
 
-                _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 0, certSet).getEncoded());
+                _sigGen.addObject(new BERTaggedObject(false, 0, certSet));
             }
 
             if (crls.size() != 0)
             {
                 ASN1Set crlSet = CMSUtils.createBerSetFromList(crls);
 
-                _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 1, crlSet).getEncoded());
+                _sigGen.addObject(new BERTaggedObject(false, 1, crlSet));
             }
 
             //
@@ -525,8 +525,8 @@ public void close()
                     signerInfos.add(signer.toASN1Structure());
                 }
             }
-            
-            _sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());
+
+            _sigGen.addObject(new DERSet(signerInfos));
 
             _sigGen.close();
             _sGen.close();
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java b/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java
@@ -460,11 +460,11 @@ static void addRecipientInfosToGenerator(ASN1EncodableVector recipientInfos, BER
     {
         if (berEncodeRecipientSet)
         {
-            authGen.getRawOutputStream().write(new BERSet(recipientInfos).getEncoded());
+            new BERSet(recipientInfos).encodeTo(authGen.getRawOutputStream());
         }
         else
         {
-            authGen.getRawOutputStream().write(new DERSet(recipientInfos).getEncoded());
+            new DERSet(recipientInfos).encodeTo(authGen.getRawOutputStream());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,7 @@ public OutputStream open(`
`154`	`154`
`155`	`155`	`CMSUtils.addRecipientInfosToGenerator(recipientInfos, authGen, berEncodeRecipientSet);`
`156`	`156`
`157`		`- AlgorithmIdentifier macAlgId = macCalculator.getAlgorithmIdentifier();`
`158`		`-`
`159`		`- authGen.getRawOutputStream().write(macAlgId.getEncoded());`
	`157`	`+ authGen.addObject(macCalculator.getAlgorithmIdentifier());`
`160`	`158`
`161`	`159`	`if (digestCalculator != null)`
`162`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ public static OutputStream replaceSigners(`
`447`	`447`	`digestAlgs.add(HELPER.fixDigestAlgID(signer.getDigestAlgorithmID(), dgstAlgFinder));`
`448`	`448`	`}`
`449`	`449`	`AlgorithmIdentifier[] newDigestAlgIds = (AlgorithmIdentifier[])digestAlgs.toArray(new AlgorithmIdentifier[digestAlgs.size()]);`
`450`		`- sigGen.getRawOutputStream().write(new DLSet(newDigestAlgIds).getEncoded());`
	`450`	`+ sigGen.addObject(new DLSet(newDigestAlgIds));`
`451`	`451`
`452`	`452`	`writeEncapContentInfoToGenerator(signedData, sigGen);`
`453`	`453`
`@@ -463,7 +463,7 @@ public static OutputStream replaceSigners(`
`463`	`463`	`signerInfos.add(signer.toASN1Structure());`
`464`	`464`	`}`
`465`	`465`
`466`		`- sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());`
	`466`	`+ sigGen.addObject(new DERSet(signerInfos));`
`467`	`467`
`468`	`468`	`sigGen.close();`
`469`	`469`
`@@ -508,7 +508,7 @@ public static OutputStream replaceCertificatesAndCRLs(`
`508`	`508`	`sigGen.addObject(signedData.getVersion());`
`509`	`509`
`510`	`510`	`// digests`
`511`		`- sigGen.getRawOutputStream().write(signedData.getDigestAlgorithms().toASN1Primitive().getEncoded());`
	`511`	`+ sigGen.addObject(signedData.getDigestAlgorithms());`
`512`	`512`
`513`	`513`	`writeEncapContentInfoToGenerator(signedData, sigGen);`
`514`	`514`
`@@ -538,7 +538,7 @@ public static OutputStream replaceCertificatesAndCRLs(`
`538`	`538`
`539`	`539`	`if (asn1Certs.size() > 0)`
`540`	`540`	`{`
`541`		`- sigGen.getRawOutputStream().write(new DERTaggedObject(false, 0, asn1Certs).getEncoded());`
	`541`	`+ sigGen.addObject(new DERTaggedObject(false, 0, asn1Certs));`
`542`	`542`	`}`
`543`	`543`	`}`
`544`	`544`
`@@ -548,11 +548,11 @@ public static OutputStream replaceCertificatesAndCRLs(`
`548`	`548`
`549`	`549`	`if (asn1Crls.size() > 0)`
`550`	`550`	`{`
`551`		`- sigGen.getRawOutputStream().write(new DERTaggedObject(false, 1, asn1Crls).getEncoded());`
	`551`	`+ sigGen.addObject(new DERTaggedObject(false, 1, asn1Crls));`
`552`	`552`	`}`
`553`	`553`	`}`
`554`	`554`
`555`		`- sigGen.getRawOutputStream().write(signedData.getSignerInfos().toASN1Primitive().getEncoded());`
	`555`	`+ sigGen.addObject(signedData.getSignerInfos());`
`556`	`556`
`557`	`557`	`sigGen.close();`
`558`	`558`
`@@ -573,11 +573,11 @@ static void writeSetToGeneratorTagged(`
`573`	`573`	`{`
`574`	`574`	`if (asn1SetParser instanceof BERSetParser)`
`575`	`575`	`{`
`576`		`- asn1Gen.getRawOutputStream().write(new BERTaggedObject(false, tagNo, asn1Set).getEncoded());`
	`576`	`+ new BERTaggedObject(false, tagNo, asn1Set).encodeTo(asn1Gen.getRawOutputStream());`
`577`	`577`	`}`
`578`	`578`	`else`
`579`	`579`	`{`
`580`		`- asn1Gen.getRawOutputStream().write(new DERTaggedObject(false, tagNo, asn1Set).getEncoded());`
	`580`	`+ new DERTaggedObject(false, tagNo, asn1Set).encodeTo(asn1Gen.getRawOutputStream());`
`581`	`581`	`}`
`582`	`582`	`}`
`583`	`583`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,13 @@ public static OutputStream addDigestAlgorithm(OutputStream out, InputStream orig`
`81`	`81`	`{`
`82`	`82`	`throw new CMSException("unable to find digest algorithm");`
`83`	`83`	`}`
`84`		`- sigGen.getRawOutputStream().write(new DERSet(digestAlgs).getEncoded());`
	`84`	`+ sigGen.addObject(new DERSet(digestAlgs));`
`85`	`85`
`86`	`86`	`CMSSignedDataParser.writeEncapContentInfoToGenerator(signedData, sigGen);`
`87`	`87`
`88`	`88`	`CMSSignedDataParser.writeSetToGeneratorTagged(sigGen, signedData.getCertificates(), 0);`
`89`	`89`	`CMSSignedDataParser.writeSetToGeneratorTagged(sigGen, signedData.getCrls(), 1);`
`90`		`- sigGen.getRawOutputStream().write(signedData.getSignerInfos().toASN1Primitive().getEncoded());`
	`90`	`+ sigGen.addObject(signedData.getSignerInfos());`
`91`	`91`
`92`	`92`	`sigGen.close();`
`93`	`93`	`sGen.close();`
Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,8 @@ public OutputStream open(`
`224`	`224`	`}`
`225`	`225`
`226`	`226`
`227`		`- sigGen.getRawOutputStream().write(CMSUtils.convertToDlSet(digestAlgs).getEncoded());`
`228`		`-`
	`227`	`+ sigGen.addObject(CMSUtils.convertToDlSet(digestAlgs));`
	`228`	`+`
`229`	`229`	`BERSequenceGenerator eiGen = new BERSequenceGenerator(sigGen.getRawOutputStream());`
`230`	`230`	`eiGen.addObject(eContentType);`
`231`	`231`
`@@ -456,14 +456,14 @@ public void close()`
`456`	`456`	`{`
`457`	`457`	`ASN1Set certSet = CMSUtils.createBerSetFromList(certs);`
`458`	`458`
`459`		`- _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 0, certSet).getEncoded());`
	`459`	`+ _sigGen.addObject(new BERTaggedObject(false, 0, certSet));`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`if (crls.size() != 0)`
`463`	`463`	`{`
`464`	`464`	`ASN1Set crlSet = CMSUtils.createBerSetFromList(crls);`
`465`	`465`
`466`		`- _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 1, crlSet).getEncoded());`
	`466`	`+ _sigGen.addObject(new BERTaggedObject(false, 1, crlSet));`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`//`
`@@ -525,8 +525,8 @@ public void close()`
`525`	`525`	`signerInfos.add(signer.toASN1Structure());`
`526`	`526`	`}`
`527`	`527`	`}`
`528`		`-`
`529`		`- _sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());`
	`528`	`+`
	`529`	`+ _sigGen.addObject(new DERSet(signerInfos));`
`530`	`530`
`531`	`531`	`_sigGen.close();`
`532`	`532`	`_sGen.close();`
Original file line number	Diff line number	Diff line change
`@@ -460,11 +460,11 @@ static void addRecipientInfosToGenerator(ASN1EncodableVector recipientInfos, BER`
`460`	`460`	`{`
`461`	`461`	`if (berEncodeRecipientSet)`
`462`	`462`	`{`
`463`		`- authGen.getRawOutputStream().write(new BERSet(recipientInfos).getEncoded());`
	`463`	`+ new BERSet(recipientInfos).encodeTo(authGen.getRawOutputStream());`
`464`	`464`	`}`
`465`	`465`	`else`
`466`	`466`	`{`
`467`		`- authGen.getRawOutputStream().write(new DERSet(recipientInfos).getEncoded());`
	`467`	`+ new DERSet(recipientInfos).encodeTo(authGen.getRawOutputStream());`
`468`	`468`	`}`
`469`	`469`	`}`
`470`	`470`