Plug resource leaks

3 files changed, 26 insertions, 32 deletions

diff --git a/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
index c6023e6c5..78f6e2719 100644
--- a/base/kra/src/com/netscape/kra/EncryptionUnit.java
+++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java
@@ -82,7 +82,7 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
      */
     public byte[] encryptInternalPrivate(byte priKey[])
             throws EBaseException {
-        try {
+        try (DerOutputStream out = new DerOutputStream()) {
             CMS.debug("EncryptionUnit.encryptInternalPrivate");
             CryptoToken internalToken = getInternalToken();
 
@@ -112,7 +112,6 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             // }
 
             DerOutputStream tmp = new DerOutputStream();
-            DerOutputStream out = new DerOutputStream();
 
             tmp.putOctetString(session);
             tmp.putOctetString(pri);
@@ -641,7 +640,7 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
      * Internal wrap, accounts for either private or symmetric key
      */
     private byte[] _wrap(PrivateKey priKey, SymmetricKey symmKey) throws EBaseException {
-        try {
+        try (DerOutputStream out = new DerOutputStream()) {
             if ((priKey == null && symmKey == null) || (priKey != null && symmKey != null)) {
                 return null;
             }
@@ -691,7 +690,6 @@ public abstract class EncryptionUnit implements IEncryptionUnit {
             // }
 
             DerOutputStream tmp = new DerOutputStream();
-            DerOutputStream out = new DerOutputStream();
 
             tmp.putOctetString(session);
             tmp.putOctetString(pri);
diff --git a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
index 3acea9ae1..f409eea96 100644
--- a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
+++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
@@ -176,7 +176,7 @@ public class NetkeyKeygenService implements IService {
                         tp = true;
                         sp = false;
                         ep = true;
-                    } else   
+                    } else
                         tp = true;
                     }
             } catch (Exception e) {
@@ -270,7 +270,7 @@ public class NetkeyKeygenService implements IService {
                     // 602548 NSS bug - to overcome it, we use isBadDSAKeyPair
                     kp = kpGen.genKeyPair();
                 }
-                while (isBadDSAKeyPair(kp)); 
+                while (isBadDSAKeyPair(kp));
                 */
                 return kp;
             }
@@ -312,18 +312,16 @@ public class NetkeyKeygenService implements IService {
         // All this streaming is lame, but Base64OutputStream needs a
         // PrintStream
         ByteArrayOutputStream output = new ByteArrayOutputStream();
-        Base64OutputStream b64 = new Base64OutputStream(new
-                PrintStream(new
-                        FilterOutputStream(output)
-                )
-                );
-
-        b64.write(bytes);
-        b64.flush();
-
-        // This is internationally safe because Base64 chars are
-        // contained within 8859_1
-        return output.toString("8859_1");
+        try (Base64OutputStream b64 = new Base64OutputStream(
+                new PrintStream(new FilterOutputStream(output)))) {
+
+            b64.write(bytes);
+            b64.flush();
+
+            // This is internationally safe because Base64 chars are
+            // contained within 8859_1
+            return output.toString("8859_1");
+        }
     }
 
     // this encrypts bytes with a symmetric key
@@ -443,7 +441,7 @@ public class NetkeyKeygenService implements IService {
             CMS.debug("NetkeyKeygenService: failed getting keygenToken");
             request.setExtData(IRequest.RESULT, Integer.valueOf(10));
             return false;
-        } else 
+        } else
             CMS.debug("NetkeyKeygenService: got keygenToken");
 
         if ((wrapped_des_key != null) &&
@@ -659,7 +657,7 @@ public class NetkeyKeygenService implements IService {
                             oidDescription);
 
                         rec.set(IKeyRecord.ATTR_META_INFO, metaInfo);
-                        // key size does not apply to EC; 
+                        // key size does not apply to EC;
                         rec.setKeySize(-1);
                     }
 
diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
index 6ce8d11a4..51059c220 100644
--- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
+++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
@@ -154,18 +154,16 @@ public class TokenKeyRecoveryService implements IService {
         // All this streaming is lame, but Base64OutputStream needs a
         // PrintStream
         ByteArrayOutputStream output = new ByteArrayOutputStream();
-        Base64OutputStream b64 = new Base64OutputStream(new
-                PrintStream(new
-                        FilterOutputStream(output)
-                )
-                );
-
-        b64.write(bytes);
-        b64.flush();
-
-        // This is internationally safe because Base64 chars are
-        // contained within 8859_1
-        return output.toString("8859_1");
+        try (Base64OutputStream b64 = new Base64OutputStream(
+                new PrintStream(new FilterOutputStream(output)))) {
+
+            b64.write(bytes);
+            b64.flush();
+
+            // This is internationally safe because Base64 chars are
+            // contained within 8859_1
+            return output.toString("8859_1");
+        }
     }
 
     // this encrypts bytes with a symmetric key