Merge pull request #24 from essentialkaos/develop

Version 1.8.0
essentialkaos · May 30, 2020 · 11572e6 · 11572e6
2 parents 0395cc2 + 80840ca
commit 11572e6
Show file tree

Hide file tree

Showing 3 changed files with 316 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -41,15 +41,18 @@ Usage: webkaos-utils command args…
 
 Commands
 
-  csr-gen host                        Generate RSA key and a certificate signing request
+┌ csr-gen host                        Generate key and a certificate signing request
+└ csr-gen config                      Generate key and a certificate signing request from OpenSSL configuration file
   csr-info csr                        Print info from certificate signing request
+  csr-config-gen output               Generate OpenSSL configuration file for certificate signing request generation
 ┌ hpkp-gen csr backup                 Generate HTTP public key pinning (HPKP) header from CSR file
 │ hpkp-gen key backup                 Generate HTTP public key pinning (HPKP) header from KEY file
 └ hpkp-gen crt backup                 Generate HTTP public key pinning (HPKP) header from CRT file
 ┌ ocsp-gen server-cert issuer-cert    Generate OCSP stapling file from server certificate
 └ ocsp-gen cert-chain                 Generate OCSP stapling file from server certificate chain
   ocsp-check host server-name         Check OCSP response status for some host
   0rtt-check host server-name         Check 0-RTT support
+  htpasswd user password              Generate record with MD5 password hash for .htpasswd files
 
 Options
 
@@ -74,6 +77,7 @@ Examples
   webkaos-utils ocsp-check essentialkaos.com
   Check OCSP response status for essentialkaos.com
 
+
 ```
 
 ### Build Status