From: Benny Baumann Date: Sun, 7 Aug 2016 00:35:56 +0000 (+0200) Subject: fix: Use internal fields csr, csrType and dn X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=b90f3da65e3eb390fe0212418797f19c77e34a20 fix: Use internal fields csr, csrType and dn Change-Id: I2ed5bdaba299b7779a3dd726e3725bb7b5db904d --- diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index 9f3ca3bd..37ba66b7 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -152,7 +152,7 @@ public class Certificate implements IdCachable { try (GigiPreparedStatement inserter = new GigiPreparedStatement("INSERT INTO certs SET md=?::`mdType`, csr_type=?::`csrType`, crt_name='', memid=?, profile=?")) { inserter.setString(1, md.toString().toLowerCase()); - inserter.setString(2, csrType.toString()); + inserter.setString(2, this.csrType.toString()); inserter.setInt(3, owner.getId()); inserter.setInt(4, profile.getId()); inserter.execute(); @@ -170,7 +170,7 @@ public class Certificate implements IdCachable { try (GigiPreparedStatement insertAVA = new GigiPreparedStatement("INSERT INTO `certAvas` SET `certId`=?, name=?, value=?")) { insertAVA.setInt(1, id); - for (Entry e : dn.entrySet()) { + for (Entry e : this.dn.entrySet()) { insertAVA.setString(2, e.getKey()); insertAVA.setString(3, e.getValue()); insertAVA.execute(); @@ -179,7 +179,7 @@ public class Certificate implements IdCachable { File csrFile = KeyStorage.locateCsr(id); csrName = csrFile.getPath(); try (FileOutputStream fos = new FileOutputStream(csrFile)) { - fos.write(csr.getBytes("UTF-8")); + fos.write(this.csr.getBytes("UTF-8")); } try (GigiPreparedStatement updater = new GigiPreparedStatement("UPDATE `certs` SET `csr_name`=? WHERE id=?")) { updater.setString(1, csrName);