Merge pull request #66 from bdonlan/kms-cache-remove

Remove the KMS client cache

Author: lizroth

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.3.5
+
+(nothing yet)
+
+## 1.3.4
+
+### Minor Changes
+
+* Removed the KMS client cache, which could result in a memory leak when
+decrypting certain malformed ciphertexts. This may reduce performance slightly
+in some scenarios.
+
 ## 1.3.3
 
 ### Minor Changes

README.md

@@ -45,7 +45,7 @@ You can get the latest release from Maven:
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-encryption-sdk-java</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-encryption-sdk-java</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>aws-encryption-sdk-java</name>

src/main/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProvider.java

@@ -259,12 +259,10 @@ private RegionalClientSupplier clientFactory() {
             AWSKMSClientBuilder builder = templateBuilder_ != null ? cloneClientBuilder(templateBuilder_)
                                                                    : AWSKMSClientBuilder.standard();
 
-            ConcurrentHashMap<String, AWSKMS> clientCache = new ConcurrentHashMap<>();
-
-            return region -> clientCache.computeIfAbsent(region, region2 -> {
+            return region -> {
                 // Clone yet again as we're going to change the region field.
-                return cloneClientBuilder(builder).withRegion(region2).build();
-            });
+                return cloneClientBuilder(builder).withRegion(region).build();
+            };
         }
     }