Add Wycheproof makefile am: 39766076a3 am: 897f4366aa

am: 30e1519d96

Change-Id: I2b49ec91204604c23292721e8bc2e9979d8e5621

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,