From 3cd0213134c8c012dc8a6c4785319f3e9ce65515 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 7 Aug 2016 02:55:54 +0200 Subject: [PATCH] fix: Memory/resource leak when encoding certificate EKUs Change-Id: Idcbf21aa40696b5930efec4d7983e428bcbd3d75 --- .../org/cacert/gigi/util/SimpleSigner.java | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java index 1cc9e9ee..6b498988 100644 --- a/util-testing/org/cacert/gigi/util/SimpleSigner.java +++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java @@ -507,35 +507,36 @@ public class SimpleSigner { private static byte[] generateEKU(String eku) throws IOException { - DerOutputStream dos = new DerOutputStream(); - for (String name : eku.split(",")) { - ObjectIdentifier oid; - switch (name) { - case "serverAuth": - oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.1"); - break; - case "clientAuth": - oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.2"); - break; - case "codeSigning": - oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.3"); - break; - case "emailProtection": - oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.4"); - break; - case "OCSPSigning": - oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.9"); - break; - - default: - throw new Error(name); + try (DerOutputStream dos = new DerOutputStream()) { + for (String name : eku.split(",")) { + ObjectIdentifier oid; + switch (name) { + case "serverAuth": + oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.1"); + break; + case "clientAuth": + oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.2"); + break; + case "codeSigning": + oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.3"); + break; + case "emailProtection": + oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.4"); + break; + case "OCSPSigning": + oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.9"); + break; + + default: + throw new Error(name); + } + dos.putOID(oid); } - dos.putOID(oid); + byte[] data = dos.toByteArray(); + dos.reset(); + dos.write(DerValue.tag_Sequence, data); + return dos.toByteArray(); } - byte[] data = dos.toByteArray(); - dos.reset(); - dos.write(DerValue.tag_Sequence, data); - return dos.toByteArray(); } public static X500Name genX500Name(Map subj) throws IOException { -- 2.39.2