Merge: branch 'TinCanTech-master' #505

Expand new verify_ssl_lib() to support LibreSSL version 2.x (again)

Closes: #504

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-03-25 16:10:18 +00:00
commit f08d9a3cf9
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246

View File

@ -464,6 +464,7 @@ verify_ssl_lib () {
osslv_major="${osslv_major%%.*}" osslv_major="${osslv_major%%.*}"
case "$osslv_major" in case "$osslv_major" in
1) no_password='-nodes' ;; 1) no_password='-nodes' ;;
2) no_password='-nodes' ;; # LibreSSL Only
3) no_password='-noenc' ;; 3) no_password='-noenc' ;;
*) die "Unsupported SSL library: $osslv_major" *) die "Unsupported SSL library: $osslv_major"
esac esac
@ -735,8 +736,8 @@ current CA keypair. If you intended to start a new CA, run init-pki first."
;; ;;
# END SSL V3 # END SSL V3
# BEGIN SSL V1 # BEGIN SSL V1 - Includes LibreSSL 2.x
1) 1|2)
# If encrypted then create the CA key using AES256 cipher ($crypto) # If encrypted then create the CA key using AES256 cipher ($crypto)
crypto_opts="" crypto_opts=""
if [ ! $nopass ]; then if [ ! $nopass ]; then