Avoid redundant OID (re-)creation

Author: peterdettman

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

@@ -139,7 +139,7 @@ public OutputStream open(
         OutputAEADEncryptor encryptor)
         throws CMSException, IOException
     {
-        return doOpen(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), out, encryptor);
+        return doOpen(CMSObjectIdentifiers.data, out, encryptor);
     }
 
     private class CMSAuthEnvelopedDataOutputStream

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

@@ -152,7 +152,7 @@ public OutputStream open(
         OutputEncryptor encryptor)
         throws CMSException, IOException
     {
-        return doOpen(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), out, encryptor);
+        return doOpen(CMSObjectIdentifiers.data, out, encryptor);
     }
 
     /**

pkix/src/main/jdk1.1/org/bouncycastle/cms/CMSAbsentContent.java

@@ -17,7 +17,7 @@ public class CMSAbsentContent
 
     public CMSAbsentContent()
     {
-        this(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()));
+        this(CMSObjectIdentifiers.data);
     }
 
     public CMSAbsentContent(

pkix/src/main/jdk1.1/org/bouncycastle/cms/CMSProcessableByteArray.java

@@ -21,7 +21,7 @@ public class CMSProcessableByteArray
     public CMSProcessableByteArray(
         byte[]  bytes)
     {
-        this(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), bytes);
+        this(CMSObjectIdentifiers.data, bytes);
     }
 
     public CMSProcessableByteArray(

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

@@ -125,7 +125,7 @@ public OutputStream open(
         OutputAEADEncryptor encryptor)
         throws CMSException, IOException
     {
-        return doOpen(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), out, encryptor);
+        return doOpen(CMSObjectIdentifiers.data, out, encryptor);
     }
 
     private class CMSAuthEnvelopedDataOutputStream

util/src/test/java/org/bouncycastle/asn1/cms/test/OctetStringTest.java

@@ -156,9 +156,9 @@ public void testNestedStructure()
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
 
         BERSequenceGenerator sGen = new BERSequenceGenerator(bOut);
-        
-        sGen.addObject(new ASN1ObjectIdentifier(CMSObjectIdentifiers.compressedData.getId()));
-        
+
+        sGen.addObject(CMSObjectIdentifiers.compressedData);
+
         BERSequenceGenerator cGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
 
         cGen.addObject(new ASN1Integer(0));