Accept CRLURI or NAME under DISTRIBUTIONNAME (#131)

Author: iadgovuser29

build.gradle

@@ -7,8 +7,8 @@ plugins {
 }
 
 // version number
-def base_version = '1.5.0'
-def base_release = 'beta5'
+def base_version = '1.5.1'
+def base_release = '1'
 def archive_version = "${base_version}-${base_release}"
 
 version = "${base_version}${base_release}"

src/main/java/json/OtherExtensionsJsonHelper.java

@@ -37,7 +37,8 @@ public enum CrlJson {
         TYPE,
         NAME,
         REASON,
-        ISSUER;
+        ISSUER,
+        CRLURI;
     }
 
     public enum TargetInformationJson {
@@ -111,15 +112,20 @@ public static final CRLDistPoint crlFromJsonFile(final String filename) {
                     final JsonNode issuerNode = crlNode.get(CrlJson.ISSUER.name());
 
                     DistributionPointName dpn = null;
-                    if (distNameNode.has(CrlJson.TYPE.name()) && distNameNode.has(CrlJson.NAME.name())) {
+                    String nameNodeText = null;
+                    if (distNameNode.has(CrlJson.NAME.name())) {
+                        nameNodeText = distNameNode.get(CrlJson.NAME.name()).asText();
+                    } else if (distNameNode.has(CrlJson.CRLURI.name())) {
+                        nameNodeText = distNameNode.get(CrlJson.CRLURI.name()).asText();
+                    }
+                    if (distNameNode.has(CrlJson.TYPE.name()) && nameNodeText != null) {
                         final JsonNode typeNode = distNameNode.get(CrlJson.TYPE.name());
-                        final JsonNode nameNode = distNameNode.get(CrlJson.NAME.name());
 
                         // TYPE=0 (fullName): URI or DN; TYPE=1 (nameRelativeToCRLIssuer): always RDN
                         if (typeNode.asInt() == 0) {
-                            dpn = new DistributionPointName(0, new GeneralNames(parseGeneralName(nameNode.asText())));
+                            dpn = new DistributionPointName(0, new GeneralNames(parseGeneralName(nameNodeText)));
                         } else {
-                            dpn = new DistributionPointName(typeNode.asInt(), new GeneralNames(new GeneralName(new X500Name(nameNode.asText()))));
+                            dpn = new DistributionPointName(typeNode.asInt(), new GeneralNames(new GeneralName(new X500Name(nameNodeText))));
                         }
                     }
 

src/test/resources/otherExt.json

@@ -22,7 +22,7 @@
     "CRLDISTRIBUTION": {
         "DISTRIBUTIONNAME": {
             "TYPE": "0",
-            "NAME": "http://crl.example.com/platform.crl"
+            "CRLURI": "http://crl.example.com/platform.crl"
         },
         "REASON": "8",
         "ISSUER": "CN=MyApp ACES CA 2, OU=MyApp Public Sector, O=MyApp, C=US"