Skip to content

Commit

Permalink
Revert "Changed KV cryptography tests to avoid using a hardcoded secu…
Browse files Browse the repository at this point in the history 
…rity provider. (Azure#21703)"

This reverts commit aa472e0.
  • Loading branch information
@mitchdenny
mitchdenny committed May 27, 2021
1 parent fe02ab2 commit 6ce2e5c
Showing 1 changed file with 14 additions and 55 deletions.
69 changes: 14 additions & 55 deletions ...s/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,29 @@
import com.azure.security.keyvault.keys.cryptography.models.KeyWrapAlgorithm;
import com.azure.security.keyvault.keys.cryptography.models.SignatureAlgorithm;
import com.azure.security.keyvault.keys.models.JsonWebKey;
//import com.azure.security.keyvault.keys.models.KeyCurveName;
import com.azure.security.keyvault.keys.models.KeyCurveName;
import com.azure.security.keyvault.keys.models.KeyOperation;
import com.azure.security.keyvault.keys.models.KeyVaultKey;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import java.security.InvalidAlgorithmParameterException;
//import java.security.KeyPair;
//import java.security.KeyPairGenerator;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
//import java.security.Provider;
//import java.security.Security;
//import java.security.spec.ECGenParameterSpec;
import java.security.Provider;
import java.security.Security;
import java.security.spec.ECGenParameterSpec;
import java.util.Arrays;
//import java.util.HashMap;
import java.util.HashMap;
import java.util.List;
//import java.util.Map;
import java.util.Map;
import java.util.Random;

import static com.azure.security.keyvault.keys.cryptography.TestHelper.DISPLAY_NAME_WITH_ARGUMENTS;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
//import static org.junit.jupiter.api.Assertions.fail;

public class CryptographyClientTest extends CryptographyClientTestBase {
private KeyClient client;
Expand Down Expand Up @@ -203,8 +202,7 @@ public void signVerifyRsa(HttpClient httpClient, CryptographyServiceVersion serv
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.security.keyvault.keys.cryptography.TestHelper#getTestParameters")
public void signVerifyEc(HttpClient httpClient, CryptographyServiceVersion serviceVersion) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
// TODO: Uncomment after fixing https://github.com/Azure/azure-sdk-for-java/issues/21677
/*initializeKeyClient(httpClient);
initializeKeyClient(httpClient);
Map<KeyCurveName, SignatureAlgorithm> curveToSignature = new HashMap<>();
curveToSignature.put(KeyCurveName.P_256, SignatureAlgorithm.ES256);
curveToSignature.put(KeyCurveName.P_384, SignatureAlgorithm.ES384);
Expand All @@ -218,28 +216,9 @@ public void signVerifyEc(HttpClient httpClient, CryptographyServiceVersion servi
curveToSpec.put(KeyCurveName.P_256K, "secp256k1");

List<KeyCurveName> curveList = Arrays.asList(KeyCurveName.P_256, KeyCurveName.P_384, KeyCurveName.P_521, KeyCurveName.P_256K);
String algorithmName = "EC";
Provider[] providers = Security.getProviders();
Provider provider = null;
for (Provider currentProvider: providers) {
if (currentProvider.containsValue(algorithmName)) {
provider = currentProvider;
break;
}
}
if (provider == null) {
for (Provider currentProvider : providers) {
System.out.println(currentProvider.getName());
}
fail(String.format("No suitable security provider for algorithm %s was found.", algorithmName));
}
Provider provider = Security.getProvider("SunEC");
for (KeyCurveName crv : curveList) {
final KeyPairGenerator generator = KeyPairGenerator.getInstance(algorithmName, provider);
final KeyPairGenerator generator = KeyPairGenerator.getInstance("EC", provider);
ECGenParameterSpec gps = new ECGenParameterSpec(curveToSpec.get(crv));
generator.initialize(gps);
KeyPair keyPair = generator.generateKeyPair();
Expand All @@ -263,12 +242,11 @@ public void signVerifyEc(HttpClient httpClient, CryptographyServiceVersion servi
if (!interceptorManager.isPlaybackMode()) {
assertTrue(verifyStatus);
}
}*/
}
}

@Test
public void signVerifyEcLocal() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
// TODO: Uncomment after fixing https://github.com/Azure/azure-sdk-for-java/issues/21677
Map<KeyCurveName, SignatureAlgorithm> curveToSignature = new HashMap<>();
curveToSignature.put(KeyCurveName.P_256, SignatureAlgorithm.ES256);
curveToSignature.put(KeyCurveName.P_384, SignatureAlgorithm.ES384);
Expand All @@ -282,28 +260,9 @@ public void signVerifyEcLocal() throws NoSuchAlgorithmException, InvalidAlgorith
curveToSpec.put(KeyCurveName.P_256K, "secp256k1");

List<KeyCurveName> curveList = Arrays.asList(KeyCurveName.P_256, KeyCurveName.P_384, KeyCurveName.P_521, KeyCurveName.P_256K);
String algorithmName = "EC";
Provider[] providers = Security.getProviders();
Provider provider = null;

for (Provider currentProvider: providers) {
if (currentProvider.containsValue(algorithmName)) {
provider = currentProvider;

break;
}
}

if (provider == null) {
for (Provider currentProvider : providers) {
System.out.println(currentProvider.getName());
}

fail(String.format("No suitable security provider for algorithm %s was found.", algorithmName));
}

Provider provider = Security.getProvider("SunEC");
for (KeyCurveName crv : curveList) {
final KeyPairGenerator generator = KeyPairGenerator.getInstance(algorithmName, provider);
final KeyPairGenerator generator = KeyPairGenerator.getInstance("EC", provider);
ECGenParameterSpec gps = new ECGenParameterSpec(curveToSpec.get(crv));
generator.initialize(gps);
KeyPair keyPair = generator.generateKeyPair();
Expand Down

0 comments on commit 6ce2e5c

Please sign in to comment.