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. + */ +package com.google.security.wycheproof; + +import com.google.security.wycheproof.WycheproofRunner.Provider; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +/** + * Amazon Corretto Crypto Provider is a Java security provider from Amazon which uses OpenSSL. See + * {@link https://github.com/corretto/amazon-corretto-crypto-provider}. + * + *
AccpAllTests runs all tests, except that tests that are explicitly excluded. + */ +@RunWith(WycheproofRunner.class) +@SuiteClasses({ + AesGcmTest.class, + BasicTest.class, + CipherInputStreamTest.class, + CipherOutputStreamTest.class, + DhTest.class, + DsaTest.class, + EcKeyTest.class, + EcdhTest.class, + EcdsaTest.class, + JsonAeadTest.class, + JsonCipherTest.class, + JsonEcdhTest.class, + JsonSignatureTest.class, + MessageDigestTest.class, + RsaEncryptionTest.class, + RsaKeyTest.class, + RsaSignatureTest.class +}) +@Provider(ProviderType.AMAZON_CORRETTO_CRYPTO_PROVIDER) +public final class AccpAllTests { + @BeforeClass + public static void setUp() throws Exception { + TestUtil.installOnlyOpenJDKProviders(); + com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider.install(); + com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider.INSTANCE.assertHealthy(); + } +} diff --git a/java/com/google/security/wycheproof/AccpTest.java b/java/com/google/security/wycheproof/AccpTest.java new file mode 100644 index 0000000..8a9d09b --- /dev/null +++ b/java/com/google/security/wycheproof/AccpTest.java @@ -0,0 +1,56 @@ +/** + * 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. + */ +package com.google.security.wycheproof; + +import com.google.security.wycheproof.WycheproofRunner.Fast; +import com.google.security.wycheproof.WycheproofRunner.Provider; +import com.google.security.wycheproof.WycheproofRunner.ProviderType; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +/** + * Amazon Corretto Crypto Provider is a Java security provider from Amazon which uses OpenSSL. See + * {@link https://github.com/corretto/amazon-corretto-crypto-provider}. + * + *
AccpAllTests runs all tests, except that tests that are explicitly excluded. + */ +@RunWith(WycheproofRunner.class) +@SuiteClasses({ + AesGcmTest.class, + BasicTest.class, + CipherInputStreamTest.class, + CipherOutputStreamTest.class, + DhTest.class, + DsaTest.class, + EcKeyTest.class, + EcdhTest.class, + EcdsaTest.class, + JsonAeadTest.class, + JsonCipherTest.class, + JsonEcdhTest.class, + JsonSignatureTest.class, + MessageDigestTest.class, + RsaEncryptionTest.class, + RsaKeyTest.class, + RsaSignatureTest.class +}) +@Provider(ProviderType.AMAZON_CORRETTO_CRYPTO_PROVIDER) +@Fast +public final class AccpTest { + @BeforeClass + public static void setUp() throws Exception { + TestUtil.installOnlyOpenJDKProviders(); + com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider.install(); + com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider.INSTANCE.assertHealthy(); + } +} diff --git a/java/com/google/security/wycheproof/WycheproofRunner.java b/java/com/google/security/wycheproof/WycheproofRunner.java index cdea9d6..61152c7 100644 --- a/java/com/google/security/wycheproof/WycheproofRunner.java +++ b/java/com/google/security/wycheproof/WycheproofRunner.java @@ -50,6 +50,7 @@ public class WycheproofRunner extends Suite { CONSCRYPT, OPENJDK, SPONGY_CASTLE, + AMAZON_CORRETTO_CRYPTO_PROVIDER } // Annotations for test runners. diff --git a/tools/build_defs.bzl b/tools/build_defs.bzl index 01b2ae6..e485bcc 100644 --- a/tools/build_defs.bzl +++ b/tools/build_defs.bzl @@ -79,3 +79,19 @@ def conscrypt_tests(srcs, deps, size, test_class, data): """Conscrypt version-specific tests.""" add_tests("ConscryptTest", conscrypt_versions, conscrypt_dep, srcs, deps, size, test_class, data) + +# Amazon Corretto Crypto Provider targets +accp_versions = ["1_1_0", "1_1_1", "1_2_0"] +accp_dep = "@amazon_corretto_crypto_provider" + +# These targets run all tests. +def accp_all_tests(srcs, deps, size, test_class, data): + """Amazon Corretto Crypto Provider version-specific tests.""" + + add_tests("AccpAllTests", accp_versions, accp_dep, srcs, deps, size, test_class, data) + +# These targets exclue @SlowTest +def accp_tests(srcs, deps, size, test_class, data): + """Amazon Corretto Crypto Provider version-specific tests.""" + + add_tests("AccpTest", accp_versions, accp_dep, srcs, deps, size, test_class, data) diff --git a/tools/local_repository_defs.bzl b/tools/local_repository_defs.bzl index b84162a..e39561f 100644 --- a/tools/local_repository_defs.bzl +++ b/tools/local_repository_defs.bzl @@ -1,4 +1,4 @@ -"""Add test targets for Bouncy Castle using a local jar. +"""Add test targets for using a local jar. """ @@ -10,6 +10,14 @@ java_import( ) """ +_accp_jar_rule = """ +java_import( + name = "accp_jar", + jars = ["accp.jar"], + visibility = ["//visibility:public"], + ) +""" + # TODO(ekasper): implement environment invalidation once supported by bazel, # see https://bazel.build/designs/2016/10/18/repository-invalidation.html # Meanwhile, users have to call 'bazel clean' explicitly when the @@ -23,6 +31,13 @@ def _local_jars_impl(repository_ctx): ) contents += _bouncycastle_jar_rule + if "WYCHEPROOF_ACCP_JAR" in repository_ctx.os.environ: + repository_ctx.symlink( + repository_ctx.os.environ["WYCHEPROOF_ACCP_JAR"], + "accp.jar", + ) + contents += _accp_jar_rule + repository_ctx.file("BUILD", contents) local_jars = repository_rule(