diff options
author | Adam Vartanian <flooey@google.com> | 2017-03-24 09:07:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-24 09:07:13 +0000 |
commit | 897f4366aa2a06bdb9bb2fdaeda31efed64c4deb (patch) | |
tree | 55b8dfa110ca183f85d7345bb6fbf59d3244a97f /java/com/google/security/wycheproof | |
parent | 882d42feb48f0195a6975d1f97533a760088fef3 (diff) | |
parent | 39766076a3426b06d22302627cb55409ab043b61 (diff) | |
download | wycheproof-897f4366aa2a06bdb9bb2fdaeda31efed64c4deb.tar.gz |
Add Wycheproof makefile
am: 39766076a3
Change-Id: Icc9dead652ef9d294cb95066de28542f9d5a9877
Diffstat (limited to 'java/com/google/security/wycheproof')
-rw-r--r-- | java/com/google/security/wycheproof/testcases/DsaTest.java | 9 | ||||
-rw-r--r-- | java/com/google/security/wycheproof/testcases/EcdsaTest.java | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/java/com/google/security/wycheproof/testcases/DsaTest.java b/java/com/google/security/wycheproof/testcases/DsaTest.java index edfaa74..bf7761e 100644 --- a/java/com/google/security/wycheproof/testcases/DsaTest.java +++ b/java/com/google/security/wycheproof/testcases/DsaTest.java @@ -28,8 +28,9 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadMXBean; +// Android-removed: Android doesn't support JMX +// import java.lang.management.ManagementFactory; +// import java.lang.management.ThreadMXBean; import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.KeyFactory; @@ -1057,6 +1058,8 @@ public class DsaTest extends TestCase { ProviderType.SPONGY_CASTLE}) @SuppressWarnings("InsecureCryptoUsage") public void testTiming() throws Exception { + // BEGIN Android-removed: Android doesn't support JMX + /* ThreadMXBean bean = ManagementFactory.getThreadMXBean(); if (!bean.isCurrentThreadCpuTimeSupported()) { System.out.println("getCurrentThreadCpuTime is not supported. Skipping"); @@ -1126,6 +1129,8 @@ public class DsaTest extends TestCase { if (maxSigmas >= 7) { fail("Signatures with short timing have a biased k"); } + */ + // END Android-removed: Android doesn't support JMX } /** diff --git a/java/com/google/security/wycheproof/testcases/EcdsaTest.java b/java/com/google/security/wycheproof/testcases/EcdsaTest.java index 92058a7..c279aaf 100644 --- a/java/com/google/security/wycheproof/testcases/EcdsaTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdsaTest.java @@ -18,8 +18,9 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadMXBean; +// Android-removed: Android doesn't support JMX +// import java.lang.management.ManagementFactory; +// import java.lang.management.ThreadMXBean; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.KeyFactory; @@ -811,6 +812,8 @@ public class EcdsaTest extends TestCase { // precomputation seems much easier than analyzing this.) public void testTiming(String algorithm, String curve, ECParameterSpec ecParams) throws Exception { + // BEGIN Android-removed: Android doesn't support JMX + /* ThreadMXBean bean = ManagementFactory.getThreadMXBean(); if (!bean.isCurrentThreadCpuTimeSupported()) { System.out.println("getCurrentThreadCpuTime is not supported. Skipping"); @@ -885,6 +888,8 @@ public class EcdsaTest extends TestCase { if (maxSigma >= 7) { fail("Signatures with short timing have a biased k"); } + */ + // END Android-removed: Android doesn't support JMX } @SlowTest(providers = {ProviderType.BOUNCY_CASTLE, ProviderType.CONSCRYPT, ProviderType.OPENJDK, |