diff options
author | Daniil Baturin <daniil@baturin.org> | 2015-07-27 03:44:23 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2015-07-27 03:44:23 +0200 |
commit | 0818b024512b220f1c50a8d87e383fd3719326af (patch) | |
tree | e1e65c05521d2fa099da8d94810fd2c9d43d7b63 | |
parent | bfa0be96e86d793e6978ce3f7750c3a21fec0ba4 (diff) | |
parent | 59355a981d001faf3ff96f14a9eb78fee8dac90e (diff) | |
download | vyatta-cfg-system-0818b024512b220f1c50a8d87e383fd3719326af.tar.gz vyatta-cfg-system-0818b024512b220f1c50a8d87e383fd3719326af.zip |
Merge branch 'lithium' of github.com:vyos/vyatta-cfg-system into lithium
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | scripts/install/install-functions | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4c4fb96f..260db742 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.20.44+vyos2+lithium32) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: use sha-512 instead of md5 for installation password + + -- Alex Harpin <development@landsofshadow.co.uk> Thu, 02 Jul 2015 00:14:27 +0100 + vyatta-cfg-system (0.20.44+vyos2+lithium31) unstable; urgency=low [ Alex Harpin ] diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 90355974..1551fbb0 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -252,7 +252,7 @@ change_password() { done # escape any slashes in resulting password - local epwd=$(mkpasswd -H md5 "$pwd1" | sed 's:/:\\/:g') + local epwd=$(mkpasswd --method=sha-512 "$pwd1" | sed 's:/:\\/:g') set_encrypted_password "$user" "$epwd" "$config" } |