diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /scripts/icehashpassword.py | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'scripts/icehashpassword.py')
| -rw-r--r-- | scripts/icehashpassword.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/icehashpassword.py b/scripts/icehashpassword.py index 6763143cab3..db7d9be9a97 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.py @@ -10,8 +10,9 @@ import sys, getopt, passlib.hash, passlib.hosts, getpass -usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin" -useCryptExt = sys.platform.startswith("linux") +usePBKDF2 = any(sys.platform == p for p in ["win32", "darwin"]) +useCryptExt = any(sys.platform.startswith(p) for p in ["linux", "freebsd", "gnukfreebsd"]) + def usage(): print("Usage: icehashpassword [options]") |