refactor of IESKEMParameterSpec

Author: dghgit

core/src/main/jdk1.1/java/util/Collections.java

@@ -383,4 +383,123 @@ public String toString()
             return c.toString();
         }
     }
+
+    public static Set synchronizedSet(Set set)
+    {
+        return new SyncSet(set);
+    }
+
+    static class SyncSet implements Set
+    {
+        private Set base;
+
+        SyncSet(Set base)
+        {
+            this.base = base;
+        }
+
+        public int size()
+        {
+            synchronized (base)
+            {
+                return base.size();
+            }
+        }
+
+        public boolean isEmpty()
+        {
+            synchronized (base)
+            {
+                return base.isEmpty();
+            }
+        }
+
+        public boolean contains(Object o)
+        {
+            synchronized (base)
+            {
+                return base.contains(o);
+            }
+        }
+
+        public Iterator iterator()
+        {
+            synchronized (base)
+            {
+                return new ArrayList(base).iterator();
+            }
+        }
+
+        public Object[] toArray()
+        {
+            synchronized (base)
+            {
+                return base.toArray();
+            }
+        }
+
+        public boolean add(Object o)
+        {
+            synchronized (base)
+            {
+                return base.add(o);
+            }
+        }
+
+        public boolean remove(Object o)
+        {
+            synchronized (base)
+            {
+                return base.remove(o);
+            }
+        }
+
+        public boolean addAll(Collection collection)
+        {
+            synchronized (base)
+            {
+                return base.addAll(collection);
+            }
+        }
+
+        public void clear()
+        {
+            synchronized (base)
+            {
+                base.clear();
+            }
+        }
+
+        public boolean removeAll(Collection collection)
+        {
+            synchronized (base)
+            {
+                return base.removeAll(collection);
+            }
+        }
+
+        public boolean retainAll(Collection collection)
+        {
+            synchronized (base)
+            {
+                return base.retainAll(collection);
+            }
+        }
+
+        public boolean containsAll(Collection collection)
+        {
+            synchronized (base)
+            {
+                return base.containsAll(collection);
+            }
+        }
+
+        public Object[] toArray(Object[] objects)
+        {
+            synchronized (base)
+            {
+                return base.toArray(objects);
+            }
+        }
+    }
 }

pkix/src/main/java/org/bouncycastle/its/jcajce/JcaETSIDataDecryptor.java

@@ -7,10 +7,10 @@
 import javax.crypto.SecretKey;
 
 import org.bouncycastle.its.operator.ETSIDataDecryptor;
+import org.bouncycastle.jcajce.spec.IESKEMParameterSpec;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
 import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
 import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.jce.spec.IESKEMParameterSpec;
 import org.bouncycastle.util.Arrays;
 
 

pkix/src/main/java/org/bouncycastle/its/jcajce/JceETSIKeyWrapper.java

@@ -11,11 +11,11 @@
 import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.its.ETSIKeyWrapper;
+import org.bouncycastle.jcajce.spec.IESKEMParameterSpec;
 import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
 import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
 import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.jce.spec.IESKEMParameterSpec;
 import org.bouncycastle.oer.its.ieee1609dot2.EncryptedDataEncryptionKey;
 import org.bouncycastle.oer.its.ieee1609dot2.basetypes.EccP256CurvePoint;
 import org.bouncycastle.oer.its.ieee1609dot2.basetypes.EciesP256EncryptedKey;