diff options
-rw-r--r-- | Android.mk | 29 | ||||
-rw-r--r-- | java/com/google/security/wycheproof/testcases/DsaTest.java | 9 | ||||
-rw-r--r-- | java/com/google/security/wycheproof/testcases/EcdsaTest.java | 9 |
3 files changed, 43 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..421d3cf --- /dev/null +++ b/Android.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +LOCAL_PATH := $(call my-dir) + +all_wycheproof_files := $(call all-java-files-under,java) +supported_wycheproof_files := $(filter-out %SpongyCastleTest.java %SpongyCastleAllTests.java,$(all_wycheproof_files)) + +include $(CLEAR_VARS) +LOCAL_MODULE := wycheproof +LOCAL_MODULE_TAGS := optional +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_SRC_FILES := $(supported_wycheproof_files) +LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt-nojarjar bouncycastle-nojarjar junit +include $(BUILD_STATIC_JAVA_LIBRARY) + +all_wycheproof_files := 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, |