Remove explicit BC usage when not necessary

Author: SalusaSecondus

src/main/java/com/amazonaws/encryptionsdk/CryptoAlgorithm.java

@@ -33,7 +33,6 @@
 
 import com.amazonaws.encryptionsdk.internal.Constants;
 import com.amazonaws.encryptionsdk.model.CiphertextHeaders;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 /**
  * Describes the cryptographic algorithms available for use in this library.

src/main/java/com/amazonaws/encryptionsdk/internal/DecryptionHandler.java

@@ -472,8 +472,7 @@ private void readHeaderFields(final CiphertextHeaders ciphertextHeaders) {
 
             try {
                 trailingSig_ = Signature.getInstance(
-                        trailingSignatureAlgorithm.getHashAndSignAlgorithm(),
-                        "BC"
+                        trailingSignatureAlgorithm.getHashAndSignAlgorithm()
                 );
 
                 trailingSig_.initVerify(trailingPublicKey);

src/main/java/com/amazonaws/encryptionsdk/internal/TrailingSignatureAlgorithm.java

@@ -77,7 +77,7 @@ public PublicKey deserializePublicKey(String keyString) {
                     new ECDomainParameters(ecSpec.getCurve(), ecSpec.getG(), ecSpec.getN(), ecSpec.getH())
             );
 
-            return new BCECPublicKey("ECDSA", keyParams, ecSpec, BouncyCastleProvider.CONFIGURATION);
+            return new BCECPublicKey("EC", keyParams, ecSpec, BouncyCastleProvider.CONFIGURATION);
         }
 
         @Override
@@ -87,7 +87,8 @@ public String serializePublicKey(PublicKey key) {
 
         @Override
         public KeyPair generateKey() throws GeneralSecurityException {
-            KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA", INTERNAL_BOUNCY_CASTLE_PROVIDER);
+            // We use BouncyCastle for this so that we can easily serialize the compressed point.
+            KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC", INTERNAL_BOUNCY_CASTLE_PROVIDER);
             keyGen.initialize(ecSpec, Utils.getSecureRandom());
 
             return keyGen.generateKeyPair();

src/test/java/com/amazonaws/encryptionsdk/DefaultCryptoMaterialsManagerTest.java

@@ -257,7 +257,7 @@ public void decrypt_testSimpleRoundTrip() throws Exception {
                 assertNull(decryptMaterials.getTrailingSignatureKey());
             } else {
                 Signature sig = Signature.getInstance(
-                        TrailingSignatureAlgorithm.forCryptoAlgorithm(algorithm).getHashAndSignAlgorithm(), "BC"
+                        TrailingSignatureAlgorithm.forCryptoAlgorithm(algorithm).getHashAndSignAlgorithm()
                 );
 
                 sig.initSign(encryptMaterials.getTrailingSignatureKey());

src/test/java/com/amazonaws/encryptionsdk/jce/KeyStoreProviderTest.java

@@ -58,8 +58,7 @@ public class KeyStoreProviderTest {
 
     static {
         try {
-            Security.addProvider(new BouncyCastleProvider());
-            KG = KeyPairGenerator.getInstance("RSA", "BC");
+            KG = KeyPairGenerator.getInstance("RSA");
             KG.initialize(2048);
         } catch (Exception ex) {
             throw new RuntimeException(ex);