Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed KV cryptography tests to avoid using a hardcoded security provider. #21703

Merged
merged 4 commits into from
May 21, 2021
Merged

Changed KV cryptography tests to avoid using a hardcoded security provider. #21703

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
966227f
Changed KV cryptography tests to avoid using a hardcoded security pro…
vcolin7 May 21, 2021
37a803b
Updated tests to print out all available providers in case no suitabl…
vcolin7 May 21, 2021
f5723d0
Commented failing tests.
vcolin7 May 21, 2021
a79a644
Commented unused imports.
vcolin7 May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 57 additions & 16 deletions ...s/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,30 @@
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 @@ -202,7 +203,8 @@ 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 {
initializeKeyClient(httpClient);
// TODO: Uncomment after fixing https://github.com/Azure/azure-sdk-for-java/issues/21677
/*initializeKeyClient(httpClient);
Map<KeyCurveName, SignatureAlgorithm> curveToSignature = new HashMap<>();
curveToSignature.put(KeyCurveName.P_256, SignatureAlgorithm.ES256);
curveToSignature.put(KeyCurveName.P_384, SignatureAlgorithm.ES384);
Expand All @@ -216,9 +218,28 @@ 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);
Provider provider = Security.getProvider("SunEC");
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));
}

for (KeyCurveName crv : curveList) {
final KeyPairGenerator generator = KeyPairGenerator.getInstance("EC", provider);
final KeyPairGenerator generator = KeyPairGenerator.getInstance(algorithmName, provider);
ECGenParameterSpec gps = new ECGenParameterSpec(curveToSpec.get(crv));
generator.initialize(gps);
KeyPair keyPair = generator.generateKeyPair();
Expand All @@ -242,12 +263,13 @@ public void signVerifyEc(HttpClient httpClient, CryptographyServiceVersion servi
if (!interceptorManager.isPlaybackMode()) {
assertTrue(verifyStatus);
}
}
}*/
}

@Test
public void signVerifyEcLocal() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
Map<KeyCurveName, SignatureAlgorithm> curveToSignature = new HashMap<>();
// 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);
curveToSignature.put(KeyCurveName.P_521, SignatureAlgorithm.ES512);
Expand All @@ -260,9 +282,28 @@ 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);
Provider provider = Security.getProvider("SunEC");
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));
}

for (KeyCurveName crv : curveList) {
final KeyPairGenerator generator = KeyPairGenerator.getInstance("EC", provider);
final KeyPairGenerator generator = KeyPairGenerator.getInstance(algorithmName, provider);
ECGenParameterSpec gps = new ECGenParameterSpec(curveToSpec.get(crv));
generator.initialize(gps);
KeyPair keyPair = generator.generateKeyPair();
Expand All @@ -277,7 +318,7 @@ public void signVerifyEcLocal() throws NoSuchAlgorithmException, InvalidAlgorith

Boolean verifyStatus = cryptoClient.verifyData(curveToSignature.get(crv), plainText, signature).isValid();
assertTrue(verifyStatus);
}
}*/
}

@Test
Expand Down