update Certificate structure and readme

CaliDog · Nov 11, 2017 · 3603fd0 · 3603fd0
1 parent f461f00
commit 3603fd0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Step 2: Add dependency to pom.xml:
 <dependency>
     <groupId>com.github.CaliDog</groupId>
     <artifactId>certstream-java</artifactId>
-    <version>0.1</version>
+    <version>0.2</version>
 </dependency>
 ```
 

diff --git a/src/example/ExampleClient.java b/src/example/ExampleClient.java
@@ -15,7 +15,7 @@ public class ExampleClient {
     public static void main(String[] args)
     {
         //string version of the message
-        CertStream.onMessageString(System.out::println);
+        //CertStream.onMessageString(System.out::println);
 
 
         CertStream.onMessage(msg -> System.out.println(new Gson().toJson(msg)));

diff --git a/src/io/calidog/certstream/CertStreamCertificate.java b/src/io/calidog/certstream/CertStreamCertificate.java
@@ -23,9 +23,15 @@ public class CertStreamCertificate extends X509Certificate {
 
     private String asDer;
 
+    String serialNumber;
+
+    String fingerprint;
+
+    String[] allDomains;
+
     private CertStreamCertificate() {}
 
-    public static Certificate fromPOJO(CertStreamCertificatePOJO pojo) throws CertificateException {
+    public static CertStreamCertificate fromPOJO(CertStreamCertificatePOJO pojo) throws CertificateException {
         CertStreamCertificate fullCertificate = new CertStreamCertificate();
 
         if (pojo.asDer.isEmpty())
@@ -42,6 +48,12 @@ public static Certificate fromPOJO(CertStreamCertificatePOJO pojo) throws Certif
 
         fullCertificate.subject = pojo.subject;
 
+        fullCertificate.serialNumber = pojo.serialNumber;
+
+        fullCertificate.fingerprint = pojo.fingerprint;
+
+        fullCertificate.allDomains = pojo.allDomains;
+
         return fullCertificate;
     }
 

diff --git a/src/io/calidog/certstream/CertStreamCertificatePOJO.java b/src/io/calidog/certstream/CertStreamCertificatePOJO.java
@@ -23,4 +23,11 @@ public class CertStreamCertificatePOJO {
     @SerializedName("as_der")
     String asDer;
 
+    @SerializedName("serial_number")
+    String serialNumber;
+
+    String fingerprint;
+
+    @SerializedName("all_domains")
+    String[] allDomains;
 }
diff --git a/src/io/calidog/certstream/CertStreamMessageData.java b/src/io/calidog/certstream/CertStreamMessageData.java
@@ -11,9 +11,9 @@ public class CertStreamMessageData {
 
     String updateType;
 
-    Certificate leafCert;
+    CertStreamCertificate leafCert;
 
-    Certificate[] chain;
+    CertStreamCertificate[] chain;
 
     long certIndex;