update openssl rand password generation routines in 123.09beta01

- correct the openssl rand syntax so it works with either openssl 1.0.x or 1.1.1 as previous syntax and positioning of arguments only worked with openssl 1.0.x and not openssl 1.1.1
centminmod · Dec 25, 2021 · 134b253 · 134b253
1 parent 0d24209
commit 134b253
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/addons/linfo.sh b/addons/linfo.sh
@@ -115,9 +115,9 @@ rm -rf ${LINFOPATH}/config.inc.php
 ###########################################
 passp() {
 
-CSALT=$(/usr/bin/openssl rand 6 -base64 | tr -dc 'a-zA-Z0-9')
+CSALT=$(/usr/bin/openssl rand -base64 7 | tr -dc 'a-zA-Z0-9')
 CUSER=$(echo "admin${CSALT}")
-CPASS=$(/usr/bin/openssl rand 19 -base64 | tr -dc 'a-zA-Z0-9')
+CPASS=$(/usr/bin/openssl rand -base64 21 | tr -dc 'a-zA-Z0-9')
 
     if [[ "$(hostname -f 2>&1 | grep -w 'Unknown host')" || "$(hostname -f 2>&1 | grep -w 'service not known')" ]]; then
       hname=$(hostname)

diff --git a/centmin-cli.sh b/centmin-cli.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='773'
+SCRIPT_INCREMENTVER='774'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='24/12/2021'

diff --git a/centmin.sh b/centmin.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='773'
+SCRIPT_INCREMENTVER='774'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='24/12/2021'

diff --git a/inc/mariadb_submenu.inc b/inc/mariadb_submenu.inc
@@ -124,7 +124,7 @@ if [[ "$mysqlroot_reset" = [yY] ]]; then
     mysqld --skip-grant-tables --skip-networking --user=mysql &
     mysql -e "FLUSH PRIVILEGES;"
   fi
-  NEWMYSQLROOTPASS=$(/usr/bin/openssl rand 21 -base64 | tr -dc 'a-zA-Z0-9')
+  NEWMYSQLROOTPASS=$(/usr/bin/openssl rand -base64 24 | tr -dc 'a-zA-Z0-9')
   echo "mysqladmin -u root -p${OLDMYSQLROOTPASS} password $NEWMYSQLROOTPASS"
   mysqladmin -u root -p${OLDMYSQLROOTPASS} password $NEWMYSQLROOTPASS
   echo

diff --git a/inc/memcacheadmin.inc b/inc/memcacheadmin.inc
@@ -54,9 +54,9 @@ sed -i "s/mymemcache-server2:11211/localhost:11212/g" /usr/local/nginx/html/memc
 
 fi
 
-CSALT=$(/usr/bin/openssl rand 8 -base64 | tr -dc 'a-zA-Z0-9')
+CSALT=$(/usr/bin/openssl rand -base64 10 | tr -dc 'a-zA-Z0-9')
 memcacheduser=$(echo "memadmin${CSALT}")
-memcachedpassword=$(/usr/bin/openssl rand 19 -base64 | tr -dc 'a-zA-Z0-9')
+memcachedpassword=$(/usr/bin/openssl rand -base64 21 | tr -dc 'a-zA-Z0-9')
 echo ""
 
 cecho "Setup Memcached Server Admin Login Details for /usr/local/nginx/html/memcache_${N}.php" $boldgreen

diff --git a/inc/mysqlsecure.inc b/inc/mysqlsecure.inc
@@ -1,5 +1,5 @@
 securemysql() {
-THEMYSQLPASS=$(/usr/bin/openssl rand 21 -base64 | tr -dc 'a-zA-Z0-9')
+THEMYSQLPASS=$(/usr/bin/openssl rand -base64 24 | tr -dc 'a-zA-Z0-9')
 
 # mysql -e "DELETE FROM mysql.user WHERE User=""; FLUSH PRIVILEGES;"
 # mysqladmin -u root password $THEMYSQLPASS

diff --git a/inc/phpinfo.inc b/inc/phpinfo.inc
@@ -3,9 +3,9 @@ phpiadmin() {
         # Randomize phpi.php filename
         NPHP=$(od -vAn -N4 -tx < /dev/urandom)
         NPHP=$(echo ${NPHP} | sed -e 's/\s//')
-        PHPISALT=$(/usr/bin/openssl rand 11 -base64 | tr -dc 'a-zA-Z0-9')
+        PHPISALT=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
         PHPIUSER=$(echo "phpiadmin${PHPISALT}")
-        PHPIPASS=$(/usr/bin/openssl rand 19 -base64 | tr -dc 'a-zA-Z0-9')
+        PHPIPASS=$(/usr/bin/openssl rand -base64 21 | tr -dc 'a-zA-Z0-9')
         echo ""
         mv /usr/local/nginx/html/phpi.php "/usr/local/nginx/html/${NPHP}_phpi.php"
         # cecho "Insert Username/Password into /usr/local/nginx/html/${NPHP}_phpi.php file itself" $boldyellow

diff --git a/inc/wpsetup-fastcgi-cache.inc b/inc/wpsetup-fastcgi-cache.inc
@@ -146,7 +146,7 @@ fc_installredisserver() {
 }
 
 fc_dbsetup() {
-  SALT=$(/usr/bin/openssl rand 12 -base64 | tr -dc 'a-zA-Z0-9')
+  SALT=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
   DBN=$RANDOM
   DBNB=$RANDOM
   DBNC=$RANDOM
@@ -445,8 +445,8 @@ elif [[ "$SECOND_IP" ]]; then
 fi
 
 fc_wpinstall
-  WPSALT=$(/usr/bin/openssl rand 19 -base64 | tr -dc 'a-zA-Z0-9')
-  WPSALTB=$(/usr/bin/openssl rand 11 -base64 | tr -dc 'a-zA-Z0-9')
+  WPSALT=$(/usr/bin/openssl rand -base64 21 | tr -dc 'a-zA-Z0-9')
+  WPSALTB=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
   WPN=$RANDOM
   WPNB=$RANDOM
   WPADMINUSER="z${WPSALT}wp${WPNB}"
@@ -852,8 +852,8 @@ find "/home/nginx/domains/$vhostname" -type d -exec chmod g+s {} \;
 if [[ "$disablepwdprotect" != [yY] ]]; then
   # wp-login.php password protection
   if [[ -f /usr/local/nginx/conf/htpasswd.sh && ! -f /home/nginx/domains/$vhostname/htpasswd_wplogin ]]; then
-    HTWPLOGINSALT=$(/usr/bin/openssl rand 14 -base64 | tr -dc 'a-zA-Z0-9')
-    HTWPLOGINSALTB=$(/usr/bin/openssl rand 20 -base64 | tr -dc 'a-zA-Z0-9')
+    HTWPLOGINSALT=$(/usr/bin/openssl rand -base64 16 | tr -dc 'a-zA-Z0-9')
+    HTWPLOGINSALTB=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
     HTWPLOGIN=$RANDOM
     HTWPLOGINB=$RANDOM
     HTUSER="u${HTWPLOGINSALT}x${HTWPLOGIN}"

diff --git a/inc/wpsetup.inc b/inc/wpsetup.inc
@@ -53,7 +53,7 @@ installredisserver() {
 }
 
 dbsetup() {
-  SALT=$(/usr/bin/openssl rand 12 -base64 | tr -dc 'a-zA-Z0-9')
+  SALT=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
   DBN=$RANDOM
   DBNB=$RANDOM
   DBNC=$RANDOM
@@ -352,8 +352,8 @@ elif [[ "$SECOND_IP" ]]; then
 fi
 
 wpinstall
-  WPSALT=$(/usr/bin/openssl rand 19 -base64 | tr -dc 'a-zA-Z0-9')
-  WPSALTB=$(/usr/bin/openssl rand 11 -base64 | tr -dc 'a-zA-Z0-9')
+  WPSALT=$(/usr/bin/openssl rand -base64 21 | tr -dc 'a-zA-Z0-9')
+  WPSALTB=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
   WPN=$RANDOM
   WPNB=$RANDOM
   WPADMINUSER="z${WPSALT}wp${WPNB}"
@@ -753,8 +753,8 @@ find "/home/nginx/domains/$vhostname" -type d -exec chmod g+s {} \;
 if [[ "$disablepwdprotect" != [yY] ]]; then
   # wp-login.php password protection
   if [[ -f /usr/local/nginx/conf/htpasswd.sh && ! -f /home/nginx/domains/$vhostname/htpasswd_wplogin ]]; then
-    HTWPLOGINSALT=$(/usr/bin/openssl rand 14 -base64 | tr -dc 'a-zA-Z0-9')
-    HTWPLOGINSALTB=$(/usr/bin/openssl rand 20 -base64 | tr -dc 'a-zA-Z0-9')
+    HTWPLOGINSALT=$(/usr/bin/openssl rand -base64 16 | tr -dc 'a-zA-Z0-9')
+    HTWPLOGINSALTB=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
     HTWPLOGIN=$RANDOM
     HTWPLOGINB=$RANDOM
     HTUSER="u${HTWPLOGINSALT}x${HTWPLOGIN}"

diff --git a/inc/zendopcache_install.inc b/inc/zendopcache_install.inc
@@ -12,9 +12,9 @@ gethtpasswdsh
   else
     hname=$(hostname -f)
   fi
-OPSALT=$(/usr/bin/openssl rand 10 -base64 | tr -dc 'a-zA-Z0-9')
+OPSALT=$(/usr/bin/openssl rand -base64 11 | tr -dc 'a-zA-Z0-9')
 OPUSER=$(echo "opadmin${OPSALT}")
-OPPASS=$(/usr/bin/openssl rand 22 -base64 | tr -dc 'a-zA-Z0-9')
+OPPASS=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
 
   echo ""
   cecho "Creating htpasswd_opcache user/pass..." $boldyellow

diff --git a/inc/zendopcache_upgrade.inc b/inc/zendopcache_upgrade.inc
@@ -12,9 +12,9 @@ gethtpasswdsh
   else
     hname=$(hostname -f)
   fi
-OPSALT=$(/usr/bin/openssl rand 10 -base64 | tr -dc 'a-zA-Z0-9')
+OPSALT=$(/usr/bin/openssl rand -base64 11 | tr -dc 'a-zA-Z0-9')
 OPUSER=$(echo "opadmin${OPSALT}")
-OPPASS=$(/usr/bin/openssl rand 22 -base64 | tr -dc 'a-zA-Z0-9')
+OPPASS=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
 
   echo ""
   cecho "Creating htpasswd_opcache user/pass..." $boldyellow
@@ -177,9 +177,9 @@ gethtpasswdsh
   else
     hname=$(hostname -f)
   fi
-OPSALT=$(/usr/bin/openssl rand 10 -base64 | tr -dc 'a-zA-Z0-9')
+OPSALT=$(/usr/bin/openssl rand -base64 11 | tr -dc 'a-zA-Z0-9')
 OPUSER=$(echo "opadmin${OPSALT}")
-OPPASS=$(/usr/bin/openssl rand 22 -base64 | tr -dc 'a-zA-Z0-9')
+OPPASS=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
 
 N=$(od -vAn -N8 -tx < /dev/urandom | sed -e 's/\s//g')
 if [[ -f /usr/local/nginx/html/opcache.php ]]; then

diff --git a/tools/nvwp.sh b/tools/nvwp.sh
@@ -306,7 +306,7 @@ cmchkconfig() {
 }
 
 dbsetup() {
-  SALT=$(/usr/bin/openssl rand 12 -base64 | tr -dc 'a-zA-Z0-9')
+  SALT=$(/usr/bin/openssl rand -base64 14 | tr -dc 'a-zA-Z0-9')
   DBN=$RANDOM
   DBNB=$RANDOM
   DBNC=$RANDOM
@@ -746,8 +746,8 @@ find "/home/nginx/domains/$vhostname" -type d -exec chmod g+s {} \;
 
 # wp-login.php password protection
 if [[ -f /usr/local/nginx/conf/htpasswd.sh && ! -f /home/nginx/domains/$vhostname/htpasswd_wplogin ]]; then
-  HTWPLOGINSALT=$(/usr/bin/openssl rand 14 -base64 | tr -dc 'a-zA-Z0-9')
-  HTWPLOGINSALTB=$(/usr/bin/openssl rand 20 -base64 | tr -dc 'a-zA-Z0-9')
+  HTWPLOGINSALT=$(/usr/bin/openssl rand -base64 16 | tr -dc 'a-zA-Z0-9')
+  HTWPLOGINSALTB=$(/usr/bin/openssl rand -base64 23 | tr -dc 'a-zA-Z0-9')
   HTWPLOGIN=$RANDOM
   HTWPLOGINB=$RANDOM
   HTUSER="u${HTWPLOGINSALT}x${HTWPLOGIN}"