From 217dd213c0b777176e459f9a606c3395c9456fb6 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 25 Mar 2020 18:56:30 -0700 Subject: Remove redundant NOTICE copied from LICENSE. Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ie6879117c5a42f08d000875c80fc56056f1b79f1 --- NOTICE | 202 ----------------------------------------------------------------- 1 file changed, 202 deletions(-) delete mode 100644 NOTICE diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 7a4a3ea..0000000 --- a/NOTICE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. \ No newline at end of file -- cgit v1.2.3 From 3fde40e7e37267a2f7b1e38b927e07239a9ea090 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 8 Apr 2020 23:27:54 +0100 Subject: Depend on conscrypt.module.platform.api not stubs Changed the dependency from the stubs module created by the conscrypt.module.platform.api java_sdk_library to the conscrypt.module.platform.api java_sdk_library itself. Needed to allow the conscrypt.module.platform.api to be exported from conscrypt-module-sdk instead of the stubs module. Bug: 153443117 Test: m wycheproof Manually verified that the classpath was the same before and after the change. Verified that while Soong rebuilt the ninja file after this change it did not need to rebuild the wycheproof which indicates that ninja determined that the command line to build it had not changed. Change-Id: I75a46825e7dcf937083eb7954aafe6a2446b0c81 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index b86fc07..d2069fb 100644 --- a/Android.bp +++ b/Android.bp @@ -32,7 +32,7 @@ java_library_static { sdk_version: "none", system_modules: "art-module-platform-api-stubs-system-modules", libs: [ - "conscrypt.module.platform.api.stubs", + "conscrypt.module.platform.api", "junit", ], } -- cgit v1.2.3 From 446edf15302ac8cba36e66c7f224550c87bef4ad Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 28 Apr 2020 10:41:26 -0700 Subject: Add METADATA to wycheproof: Apache2=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I75100533cf6a3efdbbdabd1a2113c27fdb08fecb --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} -- cgit v1.2.3 From a1e7be65ef316dcc591aec274b49ab83ec695419 Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Sat, 2 May 2020 00:19:08 +0100 Subject: Remove deprecated BouncyCastle algorithms Stop testing BouncyCastle for removed algorithms. Bug: 67761667 Test: cts -m CtsLibcoreWycheproofBCTestCases Test: cts -m CtsLibcoreWycheproofConscryptTestCases Change-Id: I5256fe1c7fefa2bd44ab29603e1bf9e3df51631b --- .../google/security/wycheproof/BouncyCastleAllTests.java | 6 ------ java/com/google/security/wycheproof/BouncyCastleTest.java | 6 ------ java/com/google/security/wycheproof/ConscryptTest.java | 7 ++++++- java/com/google/security/wycheproof/testcases/DsaTest.java | 4 ++++ .../google/security/wycheproof/testcases/EcKeyTest.java | 14 ++++++++++++++ .../com/google/security/wycheproof/testcases/EcdhTest.java | 11 +++++++++++ .../google/security/wycheproof/testcases/EcdsaTest.java | 13 +++++++++++++ .../google/security/wycheproof/testcases/RsaKeyTest.java | 11 +++++++++++ .../security/wycheproof/testcases/RsaSignatureTest.java | 11 +++++++++++ 9 files changed, 70 insertions(+), 13 deletions(-) diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java index 7bf5792..2ce1290 100644 --- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java +++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java @@ -37,13 +37,7 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, - EcKeyTest.class, - EcdhTest.class, - EcdsaTest.class, EciesTest.class, - RsaEncryptionTest.class, - RsaKeyTest.class, - RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) public final class BouncyCastleAllTests { diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java index 6fd118c..c5beb94 100644 --- a/java/com/google/security/wycheproof/BouncyCastleTest.java +++ b/java/com/google/security/wycheproof/BouncyCastleTest.java @@ -38,13 +38,7 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, - EcKeyTest.class, - EcdhTest.class, - EcdsaTest.class, EciesTest.class, - RsaEncryptionTest.class, - RsaKeyTest.class, - RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) @Fast diff --git a/java/com/google/security/wycheproof/ConscryptTest.java b/java/com/google/security/wycheproof/ConscryptTest.java index 2a87a7b..1cd5cf6 100644 --- a/java/com/google/security/wycheproof/ConscryptTest.java +++ b/java/com/google/security/wycheproof/ConscryptTest.java @@ -31,16 +31,21 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(WycheproofRunner.class) @SuiteClasses({ + AesEaxTest.class, AesGcmTest.class, BasicTest.class, CipherInputStreamTest.class, CipherOutputStreamTest.class, + DhTest.class, + DhiesTest.class, + DsaTest.class, EcKeyTest.class, EcdhTest.class, EcdsaTest.class, + EciesTest.class, RsaEncryptionTest.class, RsaKeyTest.class, - RsaSignatureTest.class + RsaSignatureTest.class, }) @Provider(ProviderType.CONSCRYPT) @Fast diff --git a/java/com/google/security/wycheproof/testcases/DsaTest.java b/java/com/google/security/wycheproof/testcases/DsaTest.java index bf7761e..62ddb01 100644 --- a/java/com/google/security/wycheproof/testcases/DsaTest.java +++ b/java/com/google/security/wycheproof/testcases/DsaTest.java @@ -26,6 +26,7 @@ // signature multiple times, since this allows to get more accurate timings. package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -891,6 +892,9 @@ public class DsaTest extends TestCase { * test until April 2016. */ @SuppressWarnings("InsecureCryptoUsage") + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA1WithDSA is removed") public void testDsaBias() throws Exception { // q is close to 2/3 * 2^160. BigInteger q = new BigInteger("974317976835659416858874959372334979171063697271"); diff --git a/java/com/google/security/wycheproof/testcases/EcKeyTest.java b/java/com/google/security/wycheproof/testcases/EcKeyTest.java index 8d3563c..a18a8ff 100644 --- a/java/com/google/security/wycheproof/testcases/EcKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/EcKeyTest.java @@ -21,6 +21,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.KeyFactory; @@ -127,6 +129,9 @@ public class EcKeyTest extends TestCase { + "8c0b49bbb85c3303ddb1553c3b761c2caacca71606ba9ebac8", }; + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.EC is removed") public void testEncodedPublicKey() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); for (String encodedHex : EC_INVALID_PUBLIC_KEYS) { @@ -142,6 +147,9 @@ public class EcKeyTest extends TestCase { } } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testEncodedPrivateKey() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); keyGen.initialize(EcUtil.getNistP256Params()); @@ -185,6 +193,9 @@ public class EcKeyTest extends TestCase { // TODO(bleichen): use RandomUtil } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testKeyGenerationAll() throws Exception { testKeyGeneration(EcUtil.getNistP224Params(), true); testKeyGeneration(EcUtil.getNistP256Params(), true); @@ -202,6 +213,9 @@ public class EcKeyTest extends TestCase { * Nist recommends a minimal security strength of 112 bits for the time until 2030. * To achieve this security strength EC keys of at least 224 bits are required. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testDefaultKeyGeneration() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); KeyPair keyPair = keyGen.generateKeyPair(); diff --git a/java/com/google/security/wycheproof/testcases/EcdhTest.java b/java/com/google/security/wycheproof/testcases/EcdhTest.java index 00be916..c1a8b82 100644 --- a/java/com/google/security/wycheproof/testcases/EcdhTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdhTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.InvalidKeyException; @@ -827,6 +829,9 @@ public class EcdhTest extends TestCase { }; /** Checks that key agreement using ECDH works. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); ECGenParameterSpec ecSpec = new ECGenParameterSpec("secp256r1"); @@ -845,6 +850,9 @@ public class EcdhTest extends TestCase { assertEquals(TestUtil.bytesToHex(kAB), TestUtil.bytesToHex(kBA)); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyAgreement.ECDH is removed") public void testVectors() throws Exception { KeyAgreement ka = KeyAgreement.getInstance("ECDH"); for (EcdhTestVector t : ECDH_TEST_VECTORS) { @@ -859,6 +867,9 @@ public class EcdhTest extends TestCase { } } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.EC is removed") public void testDecode() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); ECPublicKey key1 = (ECPublicKey) kf.generatePublic(EC_VALID_PUBLIC_KEY.getSpec()); diff --git a/java/com/google/security/wycheproof/testcases/EcdsaTest.java b/java/com/google/security/wycheproof/testcases/EcdsaTest.java index c279aaf..0d65286 100644 --- a/java/com/google/security/wycheproof/testcases/EcdsaTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdsaTest.java @@ -16,6 +16,7 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -640,12 +641,18 @@ public class EcdsaTest extends TestCase { assertEquals(0, errors); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testValidSignatures() throws Exception { testVectors( VALID_SIGNATURES, publicKey1(), "Hello", "SHA256WithECDSA", "Valid ECDSA signature", true, true); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testModifiedSignatures() throws Exception { testVectors( MODIFIED_SIGNATURES, @@ -657,6 +664,9 @@ public class EcdsaTest extends TestCase { true); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testInvalidSignatures() throws Exception { testVectors( INVALID_SIGNATURES, @@ -672,6 +682,9 @@ public class EcdsaTest extends TestCase { * This test checks the basic functionality of ECDSA. It can also be used to generate simple test * vectors. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithECDSA"; String hashAlgorithm = "SHA-256"; diff --git a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java index b761dae..bfe5249 100644 --- a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1454,6 +1456,9 @@ public class RsaKeyTest extends TestCase { checkKeyPair(keypair, keySizeInBits); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.RSA is removed") public void testKeyGeneration() throws Exception { testKeyGenerationSize(1024); testKeyGenerationSize(2048); @@ -1466,6 +1471,9 @@ public class RsaKeyTest extends TestCase { * Such a failure does not need to be a bug, since several encoding for the same key are * possible. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testEncodeDecodePublic() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); byte[] encoded = TestUtil.hexToBytes(ENCODED_PUBLIC_KEY); @@ -1483,6 +1491,9 @@ public class RsaKeyTest extends TestCase { * This test has mostly "defense in depth" characteristic, since applications should * never accept unauthenticated public keys. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testModifiedPublicKeyDecoding() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); int cnt = 0; diff --git a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java index 3d214fe..f9e97ba 100644 --- a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1074,6 +1076,9 @@ public class RsaSignatureTest extends TestCase { + "0000", }; + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.RSA is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithRSA"; String hashAlgorithm = "SHA-256"; @@ -1155,6 +1160,9 @@ public class RsaSignatureTest extends TestCase { } /** SunJCE threw an OutOfMemoryError with one of the signatures. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testVectorsAll() throws Exception { testVectors(RSA_KEY1, ALGORITHM_KEY1, SIGNATURES_KEY1); } @@ -1187,6 +1195,9 @@ public class RsaSignatureTest extends TestCase { * https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/Jo5S7HtEABI claims that * 7% of the responses in the Online Certificate Status Protocol (OCSP) miss the NULL parameter */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testLegacySignatures() throws Exception { RSAPublicKeySpec key = RSA_KEY1; String algorithm = ALGORITHM_KEY1; -- cgit v1.2.3 From fb6114ffb91ffa2d119c35d3d1a855254577f930 Mon Sep 17 00:00:00 2001 From: Jack He Date: Tue, 5 May 2020 00:16:03 +0000 Subject: Revert "Remove deprecated BouncyCastle algorithms" Revert "Remove deprecated BouncyCastle algorithms" Revert submission 1299358-remove_bc_algos Reason for revert: broke higkey-userdebug Bug: 155693016 Reverted Changes: I98adb4d2f:Load default KeyFactory instead of BC's implementa... I5256fe1c7:Remove deprecated BouncyCastle algorithms I0437de742:Remove deprecated BouncyCastle algorithms Ie9e0cfa02:Remove deprecated BouncyCastle algorithms Change-Id: I6030fdd2339b62ba51e7322caa3224f18023373e --- .../google/security/wycheproof/BouncyCastleAllTests.java | 6 ++++++ java/com/google/security/wycheproof/BouncyCastleTest.java | 6 ++++++ java/com/google/security/wycheproof/ConscryptTest.java | 7 +------ java/com/google/security/wycheproof/testcases/DsaTest.java | 4 ---- .../google/security/wycheproof/testcases/EcKeyTest.java | 14 -------------- .../com/google/security/wycheproof/testcases/EcdhTest.java | 11 ----------- .../google/security/wycheproof/testcases/EcdsaTest.java | 13 ------------- .../google/security/wycheproof/testcases/RsaKeyTest.java | 11 ----------- .../security/wycheproof/testcases/RsaSignatureTest.java | 11 ----------- 9 files changed, 13 insertions(+), 70 deletions(-) diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java index 2ce1290..7bf5792 100644 --- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java +++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java @@ -37,7 +37,13 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, + EcKeyTest.class, + EcdhTest.class, + EcdsaTest.class, EciesTest.class, + RsaEncryptionTest.class, + RsaKeyTest.class, + RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) public final class BouncyCastleAllTests { diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java index c5beb94..6fd118c 100644 --- a/java/com/google/security/wycheproof/BouncyCastleTest.java +++ b/java/com/google/security/wycheproof/BouncyCastleTest.java @@ -38,7 +38,13 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, + EcKeyTest.class, + EcdhTest.class, + EcdsaTest.class, EciesTest.class, + RsaEncryptionTest.class, + RsaKeyTest.class, + RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) @Fast diff --git a/java/com/google/security/wycheproof/ConscryptTest.java b/java/com/google/security/wycheproof/ConscryptTest.java index 1cd5cf6..2a87a7b 100644 --- a/java/com/google/security/wycheproof/ConscryptTest.java +++ b/java/com/google/security/wycheproof/ConscryptTest.java @@ -31,21 +31,16 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(WycheproofRunner.class) @SuiteClasses({ - AesEaxTest.class, AesGcmTest.class, BasicTest.class, CipherInputStreamTest.class, CipherOutputStreamTest.class, - DhTest.class, - DhiesTest.class, - DsaTest.class, EcKeyTest.class, EcdhTest.class, EcdsaTest.class, - EciesTest.class, RsaEncryptionTest.class, RsaKeyTest.class, - RsaSignatureTest.class, + RsaSignatureTest.class }) @Provider(ProviderType.CONSCRYPT) @Fast diff --git a/java/com/google/security/wycheproof/testcases/DsaTest.java b/java/com/google/security/wycheproof/testcases/DsaTest.java index 62ddb01..bf7761e 100644 --- a/java/com/google/security/wycheproof/testcases/DsaTest.java +++ b/java/com/google/security/wycheproof/testcases/DsaTest.java @@ -26,7 +26,6 @@ // signature multiple times, since this allows to get more accurate timings. package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -892,9 +891,6 @@ public class DsaTest extends TestCase { * test until April 2016. */ @SuppressWarnings("InsecureCryptoUsage") - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "Signature.SHA1WithDSA is removed") public void testDsaBias() throws Exception { // q is close to 2/3 * 2^160. BigInteger q = new BigInteger("974317976835659416858874959372334979171063697271"); diff --git a/java/com/google/security/wycheproof/testcases/EcKeyTest.java b/java/com/google/security/wycheproof/testcases/EcKeyTest.java index a18a8ff..8d3563c 100644 --- a/java/com/google/security/wycheproof/testcases/EcKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/EcKeyTest.java @@ -21,8 +21,6 @@ package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; -import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.KeyFactory; @@ -129,9 +127,6 @@ public class EcKeyTest extends TestCase { + "8c0b49bbb85c3303ddb1553c3b761c2caacca71606ba9ebac8", }; - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.EC is removed") public void testEncodedPublicKey() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); for (String encodedHex : EC_INVALID_PUBLIC_KEYS) { @@ -147,9 +142,6 @@ public class EcKeyTest extends TestCase { } } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.EC is removed") public void testEncodedPrivateKey() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); keyGen.initialize(EcUtil.getNistP256Params()); @@ -193,9 +185,6 @@ public class EcKeyTest extends TestCase { // TODO(bleichen): use RandomUtil } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.EC is removed") public void testKeyGenerationAll() throws Exception { testKeyGeneration(EcUtil.getNistP224Params(), true); testKeyGeneration(EcUtil.getNistP256Params(), true); @@ -213,9 +202,6 @@ public class EcKeyTest extends TestCase { * Nist recommends a minimal security strength of 112 bits for the time until 2030. * To achieve this security strength EC keys of at least 224 bits are required. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.EC is removed") public void testDefaultKeyGeneration() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); KeyPair keyPair = keyGen.generateKeyPair(); diff --git a/java/com/google/security/wycheproof/testcases/EcdhTest.java b/java/com/google/security/wycheproof/testcases/EcdhTest.java index c1a8b82..00be916 100644 --- a/java/com/google/security/wycheproof/testcases/EcdhTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdhTest.java @@ -16,8 +16,6 @@ package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; -import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.InvalidKeyException; @@ -829,9 +827,6 @@ public class EcdhTest extends TestCase { }; /** Checks that key agreement using ECDH works. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); ECGenParameterSpec ecSpec = new ECGenParameterSpec("secp256r1"); @@ -850,9 +845,6 @@ public class EcdhTest extends TestCase { assertEquals(TestUtil.bytesToHex(kAB), TestUtil.bytesToHex(kBA)); } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyAgreement.ECDH is removed") public void testVectors() throws Exception { KeyAgreement ka = KeyAgreement.getInstance("ECDH"); for (EcdhTestVector t : ECDH_TEST_VECTORS) { @@ -867,9 +859,6 @@ public class EcdhTest extends TestCase { } } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.EC is removed") public void testDecode() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); ECPublicKey key1 = (ECPublicKey) kf.generatePublic(EC_VALID_PUBLIC_KEY.getSpec()); diff --git a/java/com/google/security/wycheproof/testcases/EcdsaTest.java b/java/com/google/security/wycheproof/testcases/EcdsaTest.java index 0d65286..c279aaf 100644 --- a/java/com/google/security/wycheproof/testcases/EcdsaTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdsaTest.java @@ -16,7 +16,6 @@ package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -641,18 +640,12 @@ public class EcdsaTest extends TestCase { assertEquals(0, errors); } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "Signature.SHA256WithECDSA is removed") public void testValidSignatures() throws Exception { testVectors( VALID_SIGNATURES, publicKey1(), "Hello", "SHA256WithECDSA", "Valid ECDSA signature", true, true); } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "Signature.SHA256WithECDSA is removed") public void testModifiedSignatures() throws Exception { testVectors( MODIFIED_SIGNATURES, @@ -664,9 +657,6 @@ public class EcdsaTest extends TestCase { true); } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "Signature.SHA256WithECDSA is removed") public void testInvalidSignatures() throws Exception { testVectors( INVALID_SIGNATURES, @@ -682,9 +672,6 @@ public class EcdsaTest extends TestCase { * This test checks the basic functionality of ECDSA. It can also be used to generate simple test * vectors. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithECDSA"; String hashAlgorithm = "SHA-256"; diff --git a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java index bfe5249..b761dae 100644 --- a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java @@ -16,8 +16,6 @@ package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; -import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1456,9 +1454,6 @@ public class RsaKeyTest extends TestCase { checkKeyPair(keypair, keySizeInBits); } - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.RSA is removed") public void testKeyGeneration() throws Exception { testKeyGenerationSize(1024); testKeyGenerationSize(2048); @@ -1471,9 +1466,6 @@ public class RsaKeyTest extends TestCase { * Such a failure does not need to be a bug, since several encoding for the same key are * possible. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.RSA is removed") public void testEncodeDecodePublic() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); byte[] encoded = TestUtil.hexToBytes(ENCODED_PUBLIC_KEY); @@ -1491,9 +1483,6 @@ public class RsaKeyTest extends TestCase { * This test has mostly "defense in depth" characteristic, since applications should * never accept unauthenticated public keys. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.RSA is removed") public void testModifiedPublicKeyDecoding() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); int cnt = 0; diff --git a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java index f9e97ba..3d214fe 100644 --- a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java @@ -16,8 +16,6 @@ package com.google.security.wycheproof; -import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; -import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1076,9 +1074,6 @@ public class RsaSignatureTest extends TestCase { + "0000", }; - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyPairGenerator.RSA is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithRSA"; String hashAlgorithm = "SHA-256"; @@ -1160,9 +1155,6 @@ public class RsaSignatureTest extends TestCase { } /** SunJCE threw an OutOfMemoryError with one of the signatures. */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.RSA is removed") public void testVectorsAll() throws Exception { testVectors(RSA_KEY1, ALGORITHM_KEY1, SIGNATURES_KEY1); } @@ -1195,9 +1187,6 @@ public class RsaSignatureTest extends TestCase { * https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/Jo5S7HtEABI claims that * 7% of the responses in the Online Certificate Status Protocol (OCSP) miss the NULL parameter */ - @ExcludedTest( - providers = {ProviderType.BOUNCY_CASTLE}, - comment = "KeyFactory.RSA is removed") public void testLegacySignatures() throws Exception { RSAPublicKeySpec key = RSA_KEY1; String algorithm = ALGORITHM_KEY1; -- cgit v1.2.3 From 013daa2841e99defba2dd36e139d7c28d73648ec Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Wed, 6 May 2020 23:16:32 +0100 Subject: Remove deprecated BouncyCastle algorithms Stop testing BouncyCastle for removed algorithms. Bug: 67761667 Test: cts -m CtsLibcoreWycheproofBCTestCases Test: cts -m CtsLibcoreWycheproofConscryptTestCases Change-Id: I3b81937f8f80011aa9c7edbb18072079292f96a3 --- .../google/security/wycheproof/BouncyCastleAllTests.java | 6 ------ java/com/google/security/wycheproof/BouncyCastleTest.java | 6 ------ java/com/google/security/wycheproof/ConscryptTest.java | 7 ++++++- java/com/google/security/wycheproof/testcases/DsaTest.java | 4 ++++ .../google/security/wycheproof/testcases/EcKeyTest.java | 14 ++++++++++++++ .../com/google/security/wycheproof/testcases/EcdhTest.java | 11 +++++++++++ .../google/security/wycheproof/testcases/EcdsaTest.java | 13 +++++++++++++ .../google/security/wycheproof/testcases/RsaKeyTest.java | 11 +++++++++++ .../security/wycheproof/testcases/RsaSignatureTest.java | 11 +++++++++++ 9 files changed, 70 insertions(+), 13 deletions(-) diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java index 7bf5792..2ce1290 100644 --- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java +++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java @@ -37,13 +37,7 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, - EcKeyTest.class, - EcdhTest.class, - EcdsaTest.class, EciesTest.class, - RsaEncryptionTest.class, - RsaKeyTest.class, - RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) public final class BouncyCastleAllTests { diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java index 6fd118c..c5beb94 100644 --- a/java/com/google/security/wycheproof/BouncyCastleTest.java +++ b/java/com/google/security/wycheproof/BouncyCastleTest.java @@ -38,13 +38,7 @@ import org.junit.runners.Suite.SuiteClasses; DhTest.class, DhiesTest.class, DsaTest.class, - EcKeyTest.class, - EcdhTest.class, - EcdsaTest.class, EciesTest.class, - RsaEncryptionTest.class, - RsaKeyTest.class, - RsaSignatureTest.class, }) @Provider(ProviderType.BOUNCY_CASTLE) @Fast diff --git a/java/com/google/security/wycheproof/ConscryptTest.java b/java/com/google/security/wycheproof/ConscryptTest.java index 2a87a7b..1cd5cf6 100644 --- a/java/com/google/security/wycheproof/ConscryptTest.java +++ b/java/com/google/security/wycheproof/ConscryptTest.java @@ -31,16 +31,21 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(WycheproofRunner.class) @SuiteClasses({ + AesEaxTest.class, AesGcmTest.class, BasicTest.class, CipherInputStreamTest.class, CipherOutputStreamTest.class, + DhTest.class, + DhiesTest.class, + DsaTest.class, EcKeyTest.class, EcdhTest.class, EcdsaTest.class, + EciesTest.class, RsaEncryptionTest.class, RsaKeyTest.class, - RsaSignatureTest.class + RsaSignatureTest.class, }) @Provider(ProviderType.CONSCRYPT) @Fast diff --git a/java/com/google/security/wycheproof/testcases/DsaTest.java b/java/com/google/security/wycheproof/testcases/DsaTest.java index bf7761e..62ddb01 100644 --- a/java/com/google/security/wycheproof/testcases/DsaTest.java +++ b/java/com/google/security/wycheproof/testcases/DsaTest.java @@ -26,6 +26,7 @@ // signature multiple times, since this allows to get more accurate timings. package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -891,6 +892,9 @@ public class DsaTest extends TestCase { * test until April 2016. */ @SuppressWarnings("InsecureCryptoUsage") + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA1WithDSA is removed") public void testDsaBias() throws Exception { // q is close to 2/3 * 2^160. BigInteger q = new BigInteger("974317976835659416858874959372334979171063697271"); diff --git a/java/com/google/security/wycheproof/testcases/EcKeyTest.java b/java/com/google/security/wycheproof/testcases/EcKeyTest.java index 8d3563c..a18a8ff 100644 --- a/java/com/google/security/wycheproof/testcases/EcKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/EcKeyTest.java @@ -21,6 +21,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.KeyFactory; @@ -127,6 +129,9 @@ public class EcKeyTest extends TestCase { + "8c0b49bbb85c3303ddb1553c3b761c2caacca71606ba9ebac8", }; + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.EC is removed") public void testEncodedPublicKey() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); for (String encodedHex : EC_INVALID_PUBLIC_KEYS) { @@ -142,6 +147,9 @@ public class EcKeyTest extends TestCase { } } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testEncodedPrivateKey() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); keyGen.initialize(EcUtil.getNistP256Params()); @@ -185,6 +193,9 @@ public class EcKeyTest extends TestCase { // TODO(bleichen): use RandomUtil } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testKeyGenerationAll() throws Exception { testKeyGeneration(EcUtil.getNistP224Params(), true); testKeyGeneration(EcUtil.getNistP256Params(), true); @@ -202,6 +213,9 @@ public class EcKeyTest extends TestCase { * Nist recommends a minimal security strength of 112 bits for the time until 2030. * To achieve this security strength EC keys of at least 224 bits are required. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testDefaultKeyGeneration() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); KeyPair keyPair = keyGen.generateKeyPair(); diff --git a/java/com/google/security/wycheproof/testcases/EcdhTest.java b/java/com/google/security/wycheproof/testcases/EcdhTest.java index 00be916..c1a8b82 100644 --- a/java/com/google/security/wycheproof/testcases/EcdhTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdhTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.InvalidKeyException; @@ -827,6 +829,9 @@ public class EcdhTest extends TestCase { }; /** Checks that key agreement using ECDH works. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC"); ECGenParameterSpec ecSpec = new ECGenParameterSpec("secp256r1"); @@ -845,6 +850,9 @@ public class EcdhTest extends TestCase { assertEquals(TestUtil.bytesToHex(kAB), TestUtil.bytesToHex(kBA)); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyAgreement.ECDH is removed") public void testVectors() throws Exception { KeyAgreement ka = KeyAgreement.getInstance("ECDH"); for (EcdhTestVector t : ECDH_TEST_VECTORS) { @@ -859,6 +867,9 @@ public class EcdhTest extends TestCase { } } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.EC is removed") public void testDecode() throws Exception { KeyFactory kf = KeyFactory.getInstance("EC"); ECPublicKey key1 = (ECPublicKey) kf.generatePublic(EC_VALID_PUBLIC_KEY.getSpec()); diff --git a/java/com/google/security/wycheproof/testcases/EcdsaTest.java b/java/com/google/security/wycheproof/testcases/EcdsaTest.java index c279aaf..0d65286 100644 --- a/java/com/google/security/wycheproof/testcases/EcdsaTest.java +++ b/java/com/google/security/wycheproof/testcases/EcdsaTest.java @@ -16,6 +16,7 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; import com.google.security.wycheproof.WycheproofRunner.ProviderType; import com.google.security.wycheproof.WycheproofRunner.SlowTest; // Android-removed: Android doesn't support JMX @@ -640,12 +641,18 @@ public class EcdsaTest extends TestCase { assertEquals(0, errors); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testValidSignatures() throws Exception { testVectors( VALID_SIGNATURES, publicKey1(), "Hello", "SHA256WithECDSA", "Valid ECDSA signature", true, true); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testModifiedSignatures() throws Exception { testVectors( MODIFIED_SIGNATURES, @@ -657,6 +664,9 @@ public class EcdsaTest extends TestCase { true); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "Signature.SHA256WithECDSA is removed") public void testInvalidSignatures() throws Exception { testVectors( INVALID_SIGNATURES, @@ -672,6 +682,9 @@ public class EcdsaTest extends TestCase { * This test checks the basic functionality of ECDSA. It can also be used to generate simple test * vectors. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.EC is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithECDSA"; String hashAlgorithm = "SHA-256"; diff --git a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java index b761dae..bfe5249 100644 --- a/java/com/google/security/wycheproof/testcases/RsaKeyTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaKeyTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1454,6 +1456,9 @@ public class RsaKeyTest extends TestCase { checkKeyPair(keypair, keySizeInBits); } + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.RSA is removed") public void testKeyGeneration() throws Exception { testKeyGenerationSize(1024); testKeyGenerationSize(2048); @@ -1466,6 +1471,9 @@ public class RsaKeyTest extends TestCase { * Such a failure does not need to be a bug, since several encoding for the same key are * possible. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testEncodeDecodePublic() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); byte[] encoded = TestUtil.hexToBytes(ENCODED_PUBLIC_KEY); @@ -1483,6 +1491,9 @@ public class RsaKeyTest extends TestCase { * This test has mostly "defense in depth" characteristic, since applications should * never accept unauthenticated public keys. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testModifiedPublicKeyDecoding() throws Exception { KeyFactory kf = KeyFactory.getInstance("RSA"); int cnt = 0; diff --git a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java index 3d214fe..f9e97ba 100644 --- a/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java +++ b/java/com/google/security/wycheproof/testcases/RsaSignatureTest.java @@ -16,6 +16,8 @@ package com.google.security.wycheproof; +import com.google.security.wycheproof.WycheproofRunner.ExcludedTest; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; import java.math.BigInteger; import java.security.KeyFactory; import java.security.KeyPair; @@ -1074,6 +1076,9 @@ public class RsaSignatureTest extends TestCase { + "0000", }; + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyPairGenerator.RSA is removed") public void testBasic() throws Exception { String algorithm = "SHA256WithRSA"; String hashAlgorithm = "SHA-256"; @@ -1155,6 +1160,9 @@ public class RsaSignatureTest extends TestCase { } /** SunJCE threw an OutOfMemoryError with one of the signatures. */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testVectorsAll() throws Exception { testVectors(RSA_KEY1, ALGORITHM_KEY1, SIGNATURES_KEY1); } @@ -1187,6 +1195,9 @@ public class RsaSignatureTest extends TestCase { * https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/Jo5S7HtEABI claims that * 7% of the responses in the Online Certificate Status Protocol (OCSP) miss the NULL parameter */ + @ExcludedTest( + providers = {ProviderType.BOUNCY_CASTLE}, + comment = "KeyFactory.RSA is removed") public void testLegacySignatures() throws Exception { RSAPublicKeySpec key = RSA_KEY1; String algorithm = ALGORITHM_KEY1; -- cgit v1.2.3 From 8a6152b03aac5cccb92cc88fd9af6e2b739b96c8 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Tue, 2 Jun 2020 16:23:29 +0100 Subject: Split the core/platform API into stable and legacy versions. For now, everything outside libcore still uses the legacy version. Test: treehugger Bug: 157640067 Change-Id: I257331c27fde7499542ee23d00b0e1c3bbe29dbd --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index d2069fb..5c07309 100644 --- a/Android.bp +++ b/Android.bp @@ -30,7 +30,7 @@ java_library_static { "java/com/google/security/wycheproof/SpongyCastleAllTests.java", ], sdk_version: "none", - system_modules: "art-module-platform-api-stubs-system-modules", + system_modules: "legacy-art-module-platform-api-stubs-system-modules", libs: [ "conscrypt.module.platform.api", "junit", -- cgit v1.2.3 From 8c3e089df0baf7f7cd9ca4a23f69ef6e9535c4bd Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Wed, 3 Feb 2021 12:10:46 +0000 Subject: Run wycheproof tests against unbundled version of BouncyCastle Test: Treehugger Change-Id: I4439fb6b1052d15589bad359d1e5cb447cdc8223 --- Android.bp | 4 ++-- java/com/google/security/wycheproof/BouncyCastleAllTests.java | 2 +- java/com/google/security/wycheproof/BouncyCastleTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.bp b/Android.bp index 5c07309..8223bea 100644 --- a/Android.bp +++ b/Android.bp @@ -29,9 +29,9 @@ java_library_static { "java/com/google/security/wycheproof/SpongyCastleTest.java", "java/com/google/security/wycheproof/SpongyCastleAllTests.java", ], - sdk_version: "none", - system_modules: "legacy-art-module-platform-api-stubs-system-modules", + sdk_version: "current", libs: [ + "bouncycastle-repackaged-unbundled", "conscrypt.module.platform.api", "junit", ], diff --git a/java/com/google/security/wycheproof/BouncyCastleAllTests.java b/java/com/google/security/wycheproof/BouncyCastleAllTests.java index 2ce1290..67de46d 100644 --- a/java/com/google/security/wycheproof/BouncyCastleAllTests.java +++ b/java/com/google/security/wycheproof/BouncyCastleAllTests.java @@ -19,7 +19,7 @@ package com.google.security.wycheproof; import com.google.security.wycheproof.WycheproofRunner.Provider; import com.google.security.wycheproof.WycheproofRunner.ProviderType; // Android-changed: Update import to account for jarjar -import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider; +import com.android.internal.org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; diff --git a/java/com/google/security/wycheproof/BouncyCastleTest.java b/java/com/google/security/wycheproof/BouncyCastleTest.java index c5beb94..2da6bb8 100644 --- a/java/com/google/security/wycheproof/BouncyCastleTest.java +++ b/java/com/google/security/wycheproof/BouncyCastleTest.java @@ -20,7 +20,7 @@ import com.google.security.wycheproof.WycheproofRunner.Fast; import com.google.security.wycheproof.WycheproofRunner.Provider; import com.google.security.wycheproof.WycheproofRunner.ProviderType; // Android-changed: Update import to account for jarjar -import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider; +import com.android.internal.org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -- cgit v1.2.3 From d43f2886cc86ff3f9408828e8a366e7e7f2059be Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 3 Feb 2021 23:07:44 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/wycheproof Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7863a2b22a8fd7c7a5fc311f0f365c253869de97 --- Android.bp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Android.bp b/Android.bp index 5c07309..bcb5369 100644 --- a/Android.bp +++ b/Android.bp @@ -16,6 +16,20 @@ package { default_visibility: ["//visibility:private"], + default_applicable_licenses: ["external_wycheproof_license"], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "external_wycheproof_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE", + ], } java_library_static { -- cgit v1.2.3