diff options
author | David Hook <dgh@cryptoworkshop.com> | 2014-07-21 03:41:44 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2014-07-21 03:41:44 +0400 |
commit | a10aa6bbc74c3b5fa5409cf7cd3c816d1eb98457 (patch) | |
tree | fe05063c5de3f8e8ca5f188d8f71c846d4ba38e2 | |
parent | 093053afc2e04f88619902239f19c047e418e1ec (diff) |
portability updates
8 files changed, 25 insertions, 26 deletions
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java b/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java index 1101c2dc..dcba332a 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java @@ -1,5 +1,9 @@ package org.bouncycastle.math.ec.test; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; + import junit.framework.Test; import junit.framework.TestSuite; @@ -21,4 +25,16 @@ public class AllTests return suite; } + + static List enumToList(Enumeration en) + { + List rv = new ArrayList(); + + while (en.hasMoreElements()) + { + rv.add(en.nextElement()); + } + + return rv; + } } diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java index 2699fc34..132d8fdf 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java @@ -3,7 +3,6 @@ package org.bouncycastle.math.ec.test; import java.math.BigInteger; import java.security.SecureRandom; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -11,7 +10,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.bouncycastle.asn1.x9.ECNamedCurveTable; import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.crypto.ec.CustomNamedCurves; @@ -119,8 +117,8 @@ public class ECAlgorithmsTest extends TestCase private ArrayList getTestCurves() { ArrayList x9s = new ArrayList(); - Set names = new HashSet(Collections.list(ECNamedCurveTable.getNames())); - names.addAll(Collections.list(CustomNamedCurves.getNames())); + Set names = new HashSet(AllTests.enumToList(ECNamedCurveTable.getNames())); + names.addAll(AllTests.enumToList(CustomNamedCurves.getNames())); Iterator it = names.iterator(); while (it.hasNext()) diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java index 48f2b978..9be8d3ea 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java @@ -2,11 +2,8 @@ package org.bouncycastle.math.ec.test; import java.math.BigInteger; import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -176,8 +173,8 @@ public class ECPointPerformanceTest extends TestCase public void testMultiply() throws Exception { - SortedSet names = new TreeSet(enumToList(ECNamedCurveTable.getNames())); - names.addAll(enumToList(CustomNamedCurves.getNames())); + SortedSet names = new TreeSet(AllTests.enumToList(ECNamedCurveTable.getNames())); + names.addAll(AllTests.enumToList(CustomNamedCurves.getNames())); Set oids = new HashSet(); @@ -198,16 +195,4 @@ public class ECPointPerformanceTest extends TestCase randMult(name); } } - - private List enumToList(Enumeration en) - { - List rv = new ArrayList(); - - while (en.hasMoreElements()) - { - rv.add(en.nextElement()); - } - - return rv; - } } diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMECompressedGenerator.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMECompressedGenerator.java index bd1f0560..2701e9d0 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMECompressedGenerator.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMECompressedGenerator.java @@ -43,7 +43,7 @@ public class SMIMECompressedGenerator mc.addMailcap("application/pkcs7-mime;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.pkcs7_mime"); mc.addMailcap("application/x-pkcs7-mime;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.x_pkcs7_mime"); - AccessController.doPrivileged(new PrivilegedAction<Object>() + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEEnvelopedGenerator.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEEnvelopedGenerator.java index 38e2901d..dd547d35 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEEnvelopedGenerator.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEEnvelopedGenerator.java @@ -72,7 +72,7 @@ public class SMIMEEnvelopedGenerator static { - AccessController.doPrivileged(new PrivilegedAction<Object>() + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESigned.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESigned.java index 939a449b..9f279398 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESigned.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESigned.java @@ -90,7 +90,7 @@ public class SMIMESigned mc.addMailcap("application/x-pkcs7-mime;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.x_pkcs7_mime"); mc.addMailcap("multipart/signed;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.multipart_signed"); - AccessController.doPrivileged(new PrivilegedAction<Object>() + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java index aea7b53c..e4c96e86 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java @@ -119,7 +119,7 @@ public class SMIMESignedGenerator static { - AccessController.doPrivileged(new PrivilegedAction<Object>() + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedParser.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedParser.java index eb4f791d..0f497697 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedParser.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedParser.java @@ -133,7 +133,7 @@ public class SMIMESignedParser mc.addMailcap("application/x-pkcs7-mime;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.x_pkcs7_mime"); mc.addMailcap("multipart/signed;; x-java-content-handler=org.bouncycastle.mail.smime.handlers.multipart_signed"); - AccessController.doPrivileged(new PrivilegedAction<Object>() + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { |