fix(makeovpn): Remove expect dependency

Remove dependency on expect
Fix issue #1600 and #1601

auto_install/install.sh

@@ -1947,8 +1947,7 @@ installOpenVPN() {
     updatePackageCache
   fi
 
-  # Expect is used to feed easy-rsa with passwords
+  PIVPN_DEPS=(openvpn)
-  PIVPN_DEPS=(openvpn expect)
 
   installDependentPackages PIVPN_DEPS[@]
 }

scripts/openvpn/makeOVPN.sh

@@ -155,12 +155,8 @@ done
 
 keynoPASS() {
   # Build the client key
-  expect << EOF
+  export EASYRSA_CERT_EXPIRE "${DAYS}"
-    set timeout -1
+  ./easyrsa build-client-full "${NAME}" nopass
-    set env(EASYRSA_CERT_EXPIRE) "${DAYS}"
-    spawn ./easyrsa build-client-full "${NAME}" nopass
-    expect eof
-EOF
   cd pki || exit
 }
 
@@ -252,51 +248,11 @@ keyPASS() {
     exit 1
   fi
 
-  # Escape chars in PASSWD
+  export EASYRSA_CERT_EXPIRE="${DAYS}"
-  PASSWD_UNESCAPED="${PASSWD}"
+  ./easyrsa --passin=pass:"${PASSWD}" \
+    --passout=pass:"${PASSWD}" \
+    build-client-full "${NAME}"
 
-  PASSWD="${PASSWD//\\/\\\\}"
-  PASSWD="${PASSWD//\//\\\/}"
-  PASSWD="${PASSWD//\$/\\\$}"
-  PASSWD="${PASSWD//!/\\!}"
-  PASSWD="${PASSWD//\./\\\.}"
-  PASSWD="${PASSWD//\'/\\\'}"
-  PASSWD="${PASSWD//\"/\\\"}"
-  PASSWD="${PASSWD//*/\\*}"
-  PASSWD="${PASSWD//@/\\@}"
-  PASSWD="${PASSWD//#/\\#}"
-  PASSWD="${PASSWD//\£/\\\£}"
-  PASSWD="${PASSWD//%/\\%}"
-  PASSWD="${PASSWD//\^/\\\^}"
-  PASSWD="${PASSWD//\&/\\\&}"
-  PASSWD="${PASSWD//\(/\\\(}"
-  PASSWD="${PASSWD//\)/\\\)}"
-  PASSWD="${PASSWD//\-/\\\-}"
-  PASSWD="${PASSWD//\_/\\\_}"
-  PASSWD="${PASSWD//\+/\\\+}"
-  PASSWD="${PASSWD//\=/\\\=}"
-  PASSWD="${PASSWD//\[/\\\[}"
-  PASSWD="${PASSWD//\]/\\\]}"
-  PASSWD="${PASSWD//:/\\:}"
-  PASSWD="${PASSWD//\;/\\\;}"
-  PASSWD="${PASSWD//\|/\\\|}"
-  PASSWD="${PASSWD//\</\\\<}"
-  PASSWD="${PASSWD//\>/\\\>}"
-  PASSWD="${PASSWD//\,/\\\,}"
-  PASSWD="${PASSWD//\~/\\\~}"
-  PASSWD="${PASSWD//\?/\\\?}"
-  PASSWD="${PASSWD//\{/\\\{}"
-  PASSWD="${PASSWD//\}/\\\}}"
-
-  # Build the client key and then encrypt the key
-  expect << EOF
-  set timeout -1
-  set env(EASYRSA_CERT_EXPIRE) "${DAYS}"
-  spawn ./easyrsa build-client-full "${NAME}"
-  expect "Enter PEM pass phrase" {sleep 0.1; send -- "${PASSWD}\r"}
-  expect "Verifying - Enter PEM pass phrase" {sleep 0.1; send -- "${PASSWD}\r"}
-  expect eof
-EOF
   cd pki || exit
 }