diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-12-09 11:09:18 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-09 11:09:18 +0100 |
commit | 92f2bcee30c4bac62d1b91c75214a6222ef0a8dd (patch) | |
tree | b61fadbdc9645e19c105f3cd844aec318949443e /scripts/icehashpassword.py | |
parent | ICE-7462 - Add PHP 7.1 support (diff) | |
download | ice-92f2bcee30c4bac62d1b91c75214a6222ef0a8dd.tar.bz2 ice-92f2bcee30c4bac62d1b91c75214a6222ef0a8dd.tar.xz ice-92f2bcee30c4bac62d1b91c75214a6222ef0a8dd.zip |
Fixed ICE-7463 - icehashpassword now uses hash method instead of encrypt when available
Diffstat (limited to 'scripts/icehashpassword.py')
-rw-r--r-- | scripts/icehashpassword.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/icehashpassword.py b/scripts/icehashpassword.py index 11c62c58bfa..28dcd8bf9a1 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.py @@ -120,7 +120,8 @@ def main(): usage() return 2 - encryptfn = passScheme.encrypt + # passlib 1.7 renamed encrypt to hash + encryptfn = passScheme.hash if hasattr(passScheme, "hash") else passScheme.encrypt args = [] if sys.stdout.isatty(): |