Add CMSUtils.getEmptyParameters

Author: peterdettman

pkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedDataStreamGenerator.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;
@@ -206,7 +205,7 @@ public void close()
 
             _envGen.addObject(new DEROctetString(_encryptor.getMAC()));
 
-            CMSUtils.addAttriSetToGenerator(_envGen, unauthAttrsGenerator, 2, Collections.EMPTY_MAP);
+            CMSUtils.addAttriSetToGenerator(_envGen, unauthAttrsGenerator, 2, CMSUtils.getEmptyParameters());
 
             _envGen.close();
             _cGen.close();

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

@@ -274,7 +274,7 @@ public void close()
             }
             else
             {
-                parameters = Collections.EMPTY_MAP;
+                parameters = CMSUtils.getEmptyParameters();
             }
 
             envGen.addObject(new DEROctetString(macCalculator.getMac()));

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

@@ -229,7 +229,7 @@ public void close()
             }
             _eiGen.close();
 
-            CMSUtils.addAttriSetToGenerator(_envGen, unprotectedAttributeGenerator, 1, Collections.EMPTY_MAP);
+            CMSUtils.addAttriSetToGenerator(_envGen, unprotectedAttributeGenerator, 1, CMSUtils.getEmptyParameters());
 
             _envGen.close();
             _cGen.close();

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

@@ -492,7 +492,7 @@ static ASN1Set processAuthAttrSet(CMSAttributeTableGenerator authAttrsGenerator,
         ASN1Set authenticatedAttrSet = null;
         if (authAttrsGenerator != null)
         {
-            AttributeTable attrTable = authAttrsGenerator.getAttributes(Collections.EMPTY_MAP);
+            AttributeTable attrTable = authAttrsGenerator.getAttributes(getEmptyParameters());
 
             authenticatedAttrSet = new DERSet(attrTable.toASN1EncodableVector());
             encryptor.getAADStream().write(authenticatedAttrSet.getEncoded(ASN1Encoding.DER));
@@ -521,12 +521,12 @@ static AttributeTable getAttributesTable(ASN1SetParser set)
 
     static ASN1Set getAttrDLSet(CMSAttributeTableGenerator gen)
     {
-        return (gen != null) ? new DLSet(gen.getAttributes(Collections.EMPTY_MAP).toASN1EncodableVector()) : null;
+        return (gen != null) ? new DLSet(gen.getAttributes(getEmptyParameters()).toASN1EncodableVector()) : null;
     }
 
     static ASN1Set getAttrBERSet(CMSAttributeTableGenerator gen)
     {
-        return (gen != null) ? new BERSet(gen.getAttributes(Collections.EMPTY_MAP).toASN1EncodableVector()) : null;
+        return (gen != null) ? new BERSet(gen.getAttributes(getEmptyParameters()).toASN1EncodableVector()) : null;
     }
 
     static byte[] encodeObj(
@@ -540,4 +540,9 @@ static byte[] encodeObj(
 
         return null;
     }
+
+    static Map getEmptyParameters()
+    {
+        return Collections.EMPTY_MAP;
+    }
 }

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

@@ -5,7 +5,6 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -493,7 +492,7 @@ static ASN1Set processAuthAttrSet(CMSAttributeTableGenerator authAttrsGenerator,
         ASN1Set authenticatedAttrSet = null;
         if (authAttrsGenerator != null)
         {
-            AttributeTable attrTable = authAttrsGenerator.getAttributes(new HashMap());
+            AttributeTable attrTable = authAttrsGenerator.getAttributes(getEmptyParameters());
 
             authenticatedAttrSet = new DERSet(attrTable.toASN1EncodableVector());
             encryptor.getAADStream().write(authenticatedAttrSet.getEncoded(ASN1Encoding.DER));
@@ -522,12 +521,12 @@ static AttributeTable getAttributesTable(ASN1SetParser set)
 
     static ASN1Set getAttrDLSet(CMSAttributeTableGenerator gen)
     {
-        return (gen != null) ? new DLSet(gen.getAttributes(new HashMap()).toASN1EncodableVector()) : null;
+        return (gen != null) ? new DLSet(gen.getAttributes(getEmptyParameters()).toASN1EncodableVector()) : null;
     }
 
     static ASN1Set getAttrBERSet(CMSAttributeTableGenerator gen)
     {
-        return (gen != null) ? new BERSet(gen.getAttributes(new HashMap()).toASN1EncodableVector()) : null;
+        return (gen != null) ? new BERSet(gen.getAttributes(getEmptyParameters()).toASN1EncodableVector()) : null;
     }
 
     static byte[] encodeObj(
@@ -541,4 +540,9 @@ static byte[] encodeObj(
 
         return null;
     }
+
+    static Map getEmptyParameters()
+    {
+        return new HashMap();
+    }
 }