Add CMSAuthEnvelopedDataStreamGenerator.open taking a dataType

- remove redundant override in CMSAuthEnvelopedGenerator
- see #2221

Author: peterdettman

pkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedDataStreamGenerator.java

@@ -56,17 +56,6 @@ public void setBEREncodeRecipients(
         _berEncodeRecipientSet = berEncodeRecipientSet;
     }
 
-    private OutputStream doOpen(
-        ASN1ObjectIdentifier dataType,
-        OutputStream out,
-        OutputAEADEncryptor encryptor)
-        throws IOException, CMSException
-    {
-        ASN1EncodableVector recipientInfos = CMSUtils.getRecipentInfos(encryptor.getKey(), recipientInfoGenerators);
-
-        return open(dataType, out, recipientInfos, encryptor);
-    }
-
     protected OutputStream open(
         ASN1ObjectIdentifier dataType,
         OutputStream out,
@@ -123,22 +112,41 @@ protected OutputStream open(
     }
 
     /**
-     * generate an enveloped object that contains an CMS Enveloped Data object using the given encryptor.
+     * Generate authenticated-enveloped-data using the given encryptor, and marking the encapsulated
+     * bytes as being of type DATA.
+     * <p>
+     * <b>Stream handling note:</b> Closing the returned stream finalizes the CMS structure but <b>does
+     * not close</b> the underlying output stream. The caller remains responsible for managing the
+     * lifecycle of {@code out}.
+     *
+     * @param out the output stream to write the CMS structure to
+     * @param encryptor the cipher to use for encryption
+     * @return an output stream that writes encrypted and authenticated content
+     */
+    public OutputStream open(OutputStream out, OutputAEADEncryptor encryptor) throws CMSException, IOException
+    {
+        return open(CMSObjectIdentifiers.data, out, encryptor);
+    }
+
+    /**
+     * Generate authenticated-enveloped-data using the given encryptor, and marking the encapsulated
+     * bytes as being of the passed in type.
      * <p>
      * <b>Stream handling note:</b> Closing the returned stream finalizes the CMS structure but
      * <b>does not close</b> the underlying output stream. The caller remains responsible for
      * managing the lifecycle of {@code out}.
      *
+     * @param dataType the type of the data being written to the object.
      * @param out the output stream to write the CMS structure to
      * @param encryptor the cipher to use for encryption
      * @return an output stream that writes encrypted and authenticated content
      */
-    public OutputStream open(
-        OutputStream out,
-        OutputAEADEncryptor encryptor)
+    public OutputStream open(ASN1ObjectIdentifier dataType, OutputStream out, OutputAEADEncryptor encryptor)
         throws CMSException, IOException
     {
-        return doOpen(CMSObjectIdentifiers.data, out, encryptor);
+        ASN1EncodableVector recipientInfos = CMSUtils.getRecipentInfos(encryptor.getKey(), recipientInfoGenerators);
+
+        return open(dataType, out, recipientInfos, encryptor);
     }
 
     private class CMSAuthEnvelopedDataOutputStream

pkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedGenerator.java

@@ -43,14 +43,4 @@ public void setOriginatorInfo(OriginatorInformation originatorInfo)
     {
         this.originatorInfo = originatorInfo.toASN1Structure();
     }
-
-    /**
-     * Add a generator to produce the recipient info required.
-     *
-     * @param recipientGenerator a generator of a recipient info object.
-     */
-    public void addRecipientInfoGenerator(RecipientInfoGenerator recipientGenerator)
-    {
-        recipientInfoGenerators.add(recipientGenerator);
-    }
 }

pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Collections;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Integer;
@@ -77,17 +76,6 @@ private ASN1Integer getVersion(ASN1EncodableVector recipientInfos)
         return new ASN1Integer(EnvelopedData.calculateVersion(originatorInfo, new DLSet(recipientInfos), null));
     }
 
-    private OutputStream doOpen(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        OutputEncryptor      encryptor)
-        throws IOException, CMSException
-    {
-        ASN1EncodableVector recipientInfos = CMSUtils.getRecipentInfos(encryptor.getKey(), recipientInfoGenerators);
-
-        return open(dataType, out, recipientInfos, encryptor);
-    }
-
     protected OutputStream open(
         ASN1ObjectIdentifier dataType,
         OutputStream         out,
@@ -147,26 +135,22 @@ protected OutputStream open(
      * generate an enveloped object that contains an CMS Enveloped Data
      * object using the given encryptor.
      */
-    public OutputStream open(
-        OutputStream    out,
-        OutputEncryptor encryptor)
-        throws CMSException, IOException
+    public OutputStream open(OutputStream out, OutputEncryptor encryptor) throws CMSException, IOException
     {
-        return doOpen(CMSObjectIdentifiers.data, out, encryptor);
+        return open(CMSObjectIdentifiers.data, out, encryptor);
     }
 
     /**
      * generate an enveloped object that contains an CMS Enveloped Data
      * object using the given encryptor and marking the data as being of the passed
      * in type.
      */
-    public OutputStream open(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        OutputEncryptor      encryptor)
+    public OutputStream open(ASN1ObjectIdentifier dataType, OutputStream out, OutputEncryptor encryptor)
         throws CMSException, IOException
     {
-        return doOpen(dataType, out, encryptor);
+        ASN1EncodableVector recipientInfos = CMSUtils.getRecipentInfos(encryptor.getKey(), recipientInfoGenerators);
+
+        return open(dataType, out, recipientInfos, encryptor);
     }
 
     private class CmsEnvelopedDataOutputStream