change certificate name to contain timestamp instead of hashcode

d-shapiro · d-shapiro · commit ce3ebbe8ce03 · 2018-07-27T14:59:33.000-07:00
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/CertCollection.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/CertCollection.java
@@ -6,6 +6,7 @@
 import java.util.Base64.Encoder;
 import org.iot.dsa.node.DSIObject;
 import org.iot.dsa.node.DSNode;
+import org.iot.dsa.time.DSTime;
 
 public class CertCollection extends DSNode {
 
@@ -31,7 +32,7 @@ public boolean containsCertificate(X509Certificate cert) {
     }
     
     public static String certToName(X509Certificate cert) {
-        return cert.getIssuerX500Principal().getName() + "-" + Integer.toHexString(cert.hashCode());
+    	return DSTime.encodeForFiles(DSTime.getCalendar(System.currentTimeMillis()), new StringBuilder(cert.getIssuerX500Principal().getName())).toString();
     }
     
     public static String encodeCertificate(X509Certificate cert) throws CertificateEncodingException {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import java.util.Base64.Encoder;`
`7`	`7`	`import org.iot.dsa.node.DSIObject;`
`8`	`8`	`import org.iot.dsa.node.DSNode;`
	`9`	`+import org.iot.dsa.time.DSTime;`
`9`	`10`
`10`	`11`	`public class CertCollection extends DSNode {`
`11`	`12`
`@@ -31,7 +32,7 @@ public boolean containsCertificate(X509Certificate cert) {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public static String certToName(X509Certificate cert) {`
`34`		`- return cert.getIssuerX500Principal().getName() + "-" + Integer.toHexString(cert.hashCode());`
	`35`	`+ return DSTime.encodeForFiles(DSTime.getCalendar(System.currentTimeMillis()), new StringBuilder(cert.getIssuerX500Principal().getName())).toString();`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public static String encodeCertificate(X509Certificate cert) throws CertificateEncodingException {`