version 0.2 release

aditosoftware · Feb 10, 2017 · 260fd2a · 260fd2a
1 parent c44d38c
commit 260fd2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/config.default.yml b/config.default.yml
@@ -3,7 +3,7 @@
 ###
 
 server:
-    ip: 192.168.42.53
+    ip: 0.0.0.0
     port: 8081
 
 
@@ -31,9 +31,9 @@ ca:
         ocsp:
             passphrase: yyyy
             country: DE
-            commonname: ocsp.adito.local
+            commonname: ocsp.adito.local:2560
         crl:
-            url: http://crl.adito.local/crl.pem
+            url: http://crl.adito.local:2561/crl.pem
 
 
 ###
@@ -44,7 +44,7 @@ ca:
 ###
 
 ocsp:
-    ip: 192.168.42.53
+    ip: 0.0.0.0
     port: 2560
 
 
@@ -54,5 +54,5 @@ ocsp:
 ###
 
 crl:
-    ip: 192.168.42.53
+    ip: 0.0.0.0
     port: 2561
diff --git a/genpki.js b/genpki.js
@@ -104,6 +104,7 @@ var createFileStructure = function() {
         openssl_intermediate = openssl_intermediate.replace(/{organization}/g, global.config.ca.intermediate.organization);
         openssl_intermediate = openssl_intermediate.replace(/{commonname}/g, global.config.ca.intermediate.commonname);
         openssl_intermediate = openssl_intermediate.replace(/{ocspurl}/g, 'http://' + global.config.ca.intermediate.ocsp.commonname);
+        openssl_intermediate = openssl_intermediate.replace(/{crlurl}/g, global.config.ca.intermediate.crl.url);
 
         fs.writeFileSync(pkidir + 'intermediate/openssl.cnf', openssl_intermediate);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodepki",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "NodeJS-based PKI server for x509 certificate management.",
   "author": "Thomas Leister <thomas.leister@mailbox.org>",
   "license": "MIT",

diff --git a/pkitemplate/openssl_intermediate.cnf.tpl b/pkitemplate/openssl_intermediate.cnf.tpl
@@ -95,7 +95,7 @@ subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid,issuer:always
 keyUsage = critical, digitalSignature, keyEncipherment
 extendedKeyUsage = serverAuth
-crlDistributionPoints = URI:http://example.com/intermediate.crl.pem
+crlDistributionPoints = URI:{crlurl}
 authorityInfoAccess = OCSP;URI:{ocspurl}