From 33d4b72a4d10765aa369f70564014f47800f3ee6 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Wed, 7 Jul 2021 23:01:52 -0500 Subject: [PATCH] remove encrypt decrypt overload (#2574) * remove encrypt decrypt overload * cl * format --- .../azure-security-keyvault-keys/CHANGELOG.md | 2 ++ .../keys/cryptography/cryptography_client.hpp | 34 ------------------- .../sample4_encrypt_decrypt.cpp | 5 +-- .../ut/key_cryptographic_client_test_live.cpp | 5 +-- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index 98b61176c..e18a12658 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -13,6 +13,8 @@ - Removed `CryptographyClient::RemoteClient()` and `CryptographyClient::LocalOnly()`. - Removed the general constructor from `EncryptParameters` and `DecryptParameters`. - Removed access to `Iv` field member from `EncryptParameters` and `DecryptParameters`. +- Removed `Encrypt(EncryptionAlgorithm, std::vector, context)`. +- Removed `Decrypt(DecryptAlgorithm, std::vector, context)`. ### Key Bugs Fixed diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp index 66ef1a65d..d48fadce3 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp @@ -102,23 +102,6 @@ namespace Azure { EncryptParameters const& parameters, Azure::Core::Context const& context = Azure::Core::Context()); - /** - * @brief Encrypts the specified plaintext. - * - * @param algorithm The #EncryptionAlgorithm to use. - * @param plaintext The data to encrypt. - * @param context A #Azure::Core::Context to cancel the operation. - * @return An #EncryptResult containing the encrypted data along with all other information - * needed to decrypt it. This information should be stored with the encrypted data. - */ - EncryptResult Encrypt( - EncryptionAlgorithm algorithm, - std::vector const& plaintext, - Azure::Core::Context const& context = Azure::Core::Context()) - { - return Encrypt(EncryptParameters(algorithm, plaintext), context); - } - /** * @brief Decrypts ciphertext. * @@ -132,23 +115,6 @@ namespace Azure { DecryptParameters const& parameters, Azure::Core::Context const& context = Azure::Core::Context()); - /** - * @brief Decrypts the specified ciphertext. - * - * @param algorithm The #EncryptionAlgorithm to use. - * @param ciphertext The encrypted data to decrypt.. - * @param context A #Azure::Core::Context to cancel the operation. - * @return An #DecryptResult containing the Decrypted data along with all other information - * needed to decrypt it. This information should be stored with the Decrypted data. - */ - DecryptResult Decrypt( - EncryptionAlgorithm algorithm, - std::vector const& ciphertext, - Azure::Core::Context const& context = Azure::Core::Context()) - { - return Decrypt(DecryptParameters(algorithm, ciphertext), context); - } - /** * @brief Encrypts the specified key. * diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp index 31b6fb749..a140e0873 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp @@ -51,13 +51,14 @@ int main() uint8_t const data[] = "A single block of plaintext"; std::vector plaintext(std::begin(data), std::end(data)); - EncryptResult encryptResult = cryptoClient.Encrypt(EncryptionAlgorithm::RsaOaep, plaintext); + EncryptResult encryptResult + = cryptoClient.Encrypt(EncryptParameters::RsaOaepParameters(plaintext)); std::cout << " - Encrypted data using the algorithm " << encryptResult.Algorithm.ToString() << ", with key " << encryptResult.KeyId << ". The resulting encrypted data is: " << Azure::Core::Convert::Base64Encode(encryptResult.Ciphertext) << std::endl; DecryptResult decryptResult - = cryptoClient.Decrypt(EncryptionAlgorithm::RsaOaep, encryptResult.Ciphertext); + = cryptoClient.Decrypt(DecryptParameters::RsaOaepParameters(encryptResult.Ciphertext)); std::cout << " - Decrypted data using the algorithm " << decryptResult.Algorithm.ToString() << ", with key " << decryptResult.KeyId << ". The resulting decrypted data is: " << std::string(decryptResult.Plaintext.begin(), decryptResult.Plaintext.end()) diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp index f87809fac..7134cde48 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp @@ -37,12 +37,13 @@ TEST_P(KeyVaultClientTest, RemoteEncrypt) uint8_t plaintextSource[] = "A single block of plaintext"; std::vector plaintext(std::begin(plaintextSource), std::end(plaintextSource)); - auto encryptResult = cryptoClient.Encrypt(EncryptionAlgorithm::RsaOaep, plaintext); + auto encryptResult = cryptoClient.Encrypt(EncryptParameters::RsaOaepParameters(plaintext)); EXPECT_EQ(encryptResult.Algorithm.ToString(), EncryptionAlgorithm::RsaOaep.ToString()); EXPECT_EQ(encryptResult.KeyId, rsaKey.Id()); EXPECT_TRUE(encryptResult.Ciphertext.size() > 0); - auto decryptResult = cryptoClient.Decrypt(encryptResult.Algorithm, encryptResult.Ciphertext); + auto decryptResult + = cryptoClient.Decrypt(DecryptParameters::RsaOaepParameters(encryptResult.Ciphertext)); EXPECT_EQ(decryptResult.Algorithm.ToString(), encryptResult.Algorithm.ToString()); EXPECT_EQ(decryptResult.Plaintext, plaintext); EXPECT_EQ(decryptResult.KeyId, encryptResult.KeyId);