github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove encrypt decrypt overload (#2574)

Browse Source 
* remove encrypt decrypt overload

* cl

* format
This commit is contained in:
Victor Vazquez 2021-07-07 23:01:52 -05:00 committed by GitHub
parent ecbf8d0784
commit 33d4b72a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
View File

@ -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

34
sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
View File

@ -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<uint8_t> 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<uint8_t> const& ciphertext,
Azure::Core::Context const& context = Azure::Core::Context())
{
return Decrypt(DecryptParameters(algorithm, ciphertext), context);
}
/**
* @brief Encrypts the specified key.
*

5
sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp
View File

@ -51,13 +51,14 @@ int main()
uint8_t const data[] = "A single block of plaintext";
std::vector<uint8_t> 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())

5
sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
View File

@ -37,12 +37,13 @@ TEST_P(KeyVaultClientTest, RemoteEncrypt)
uint8_t plaintextSource[] = "A single block of plaintext";
std::vector<uint8_t> 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);