Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 am: 3fc418dda8 am: d0087c5dab am: 4f802d80c8 am: 364cf5b683

Change-Id: Ib6cbf3cf93019b89ef4828b18587e7fe6a55c55d

1 files changed, 0 insertions, 11 deletions

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());