m

Author: ajewellamz

test-server/cpp-v2-server/main.cpp

@@ -57,7 +57,6 @@ MHD_Result handle_create_client(struct MHD_Connection *connection,
     std::string kms_key_id = request["config"]["keyMaterial"]["kmsKeyId"];
     bool legacy = request["config"]["enableLegacyWrappingAlgorithms"];
 
-    Aws::KMS::KMSClient kms_client;
     auto materials =
         std::make_shared<KMSWithContextEncryptionMaterials>(kms_key_id);
     CryptoConfigurationV2 config(materials);

test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java

@@ -561,7 +561,7 @@ public void kmsV1LegacyFailsWhenLegacyDisabled(String language) {
         } catch (S3EncryptionClientError e) {
             if (language.equals(NET_V3) || language.equals(NET_V2) || language.equals(CPP_V2)) {
               assertTrue(e.getMessage().contains(
-                "The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration V2."
+                "The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration"
               ));
             } else if (language.equals(RUBY_V3) || language.equals(RUBY_V2)) {
               assertTrue(e.getMessage().contains("The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration security_profile = :v2. Retry with :v2_and_legacy or re-encrypt the object."));