diff options
Diffstat (limited to 'system/tiger/patches/zappasswd-3.2.3.patch')
| -rw-r--r-- | system/tiger/patches/zappasswd-3.2.3.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/system/tiger/patches/zappasswd-3.2.3.patch b/system/tiger/patches/zappasswd-3.2.3.patch new file mode 100644 index 0000000000..403ff6244c --- /dev/null +++ b/system/tiger/patches/zappasswd-3.2.3.patch @@ -0,0 +1,38 @@ +diff --git a/scripts/check_passwd b/scripts/check_passwd +index 4a52092..8cb69be 100755 +--- a/scripts/check_passwd ++++ b/scripts/check_passwd +@@ -129,7 +129,7 @@ check_passwd_entries() + do + + # Check the password hash. +- [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|xxxxxxxxxxxxx' ++ [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|blowfish|sha256|sha512|xxxxxxxxxxxxx' + eval "case \"$hash\" in + \"\") + message FAIL pass011f \"\" \"Username \\\`$login' has an empty password field.\" +diff --git a/systems/Linux/2/gen_passwd_sets b/systems/Linux/2/gen_passwd_sets +index ec48944..26d73f0 100755 +--- a/systems/Linux/2/gen_passwd_sets ++++ b/systems/Linux/2/gen_passwd_sets +@@ -96,9 +96,19 @@ zappasswd() + \$1\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]) + passwd="md5" + ;; ++ \$2a\$*) ++ passwd="blowfish" ++ ;; ++ \$5\$*) ++ passwd="sha256" ++ ;; ++# For SHA512 passwds starting with $6$ (Linux) ++ \$6\$*) ++ passwd="sha512" ++ ;; + " ") passwd="" + ;; +- *|!!) ++ *|!!|!\*) + passwd="*" + ;; + esac |