From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 9 Sep 2016 22:39:11 +0000 (+0100)
Subject: ssl functions
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=8601720fda8db8ef7fea618d82991bd10284e9c1;p=nb.git

ssl functions
---

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 3cbe3633..d1bb2771 100644
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -532,15 +532,6 @@ shell_push_arg() {
   eval "$to_var=\"\$$to_var \$ret\"; $to_var=\${$to_var## };"
 }
 
-ssl_cert_create() {
-  shell_help_noarg "Usage: $FUNCNAME [CERT_NAME]. Generate ssl certificate files, create .pem as a self sign." "$@" && return 1
-  declare name="$1"; shift
-  openssl genrsa -out $name.key 1024
-  openssl req -new -key $name.key -out $name.csr
-  sudo openssl x509 -req -days 365 -in $name.csr -signkey $name.key -out $name.crt
-  cat $name.crt $name.key > $name.pem
-}
-
 urlencode() {
   local length="${#1}"
   for (( i = 0; i < length; i++ )); do
diff --git a/etc/profile.d/openssl.sh b/etc/profile.d/openssl.sh
index 44e5fbce..7d6d68da 100644
--- a/etc/profile.d/openssl.sh
+++ b/etc/profile.d/openssl.sh
@@ -1,3 +1,13 @@
-openssl_site2pem() {
+ssl_site_pem() {
   openssl s_client -connect $(url2nc $@|sed 's/ /:/') -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM
 }
+
+ssl_cert_create() {
+  shell_help_noarg "Usage: $FUNCNAME [CERT_NAME]. Generate ssl certificate files, create .pem as a self sign." "$@" && return 1
+  declare name="$1"; shift
+  openssl genrsa -out $name.key 1024
+  openssl req -new -key $name.key -out $name.csr
+  sudo openssl x509 -req -days 36500 -in $name.csr -signkey $name.key -out $name.crt
+  cat $name.crt $name.key > $name.pem
+}
+