diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 16:45:33 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-08-30 16:45:33 +0200 |
| commit | 633ff45a0e9c1928c222fad4455a60943d7d29eb (patch) | |
| tree | fcd544ffa10fdda53d99e17b1424b65ef0cb69b1 /scripts/icehashpassword.py | |
| parent | ICE-7302 - Fix Java Ice/exceptions not using AMDThrowerI (diff) | |
| download | ice-633ff45a0e9c1928c222fad4455a60943d7d29eb.tar.bz2 ice-633ff45a0e9c1928c222fad4455a60943d7d29eb.tar.xz ice-633ff45a0e9c1928c222fad4455a60943d7d29eb.zip | |
Added cygwin support for icehashpassword.py
Diffstat (limited to 'scripts/icehashpassword.py')
| -rw-r--r-- | scripts/icehashpassword.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/icehashpassword.py b/scripts/icehashpassword.py index db7d9be9a97..11c62c58bfa 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.py @@ -10,7 +10,7 @@ import sys, getopt, passlib.hash, passlib.hosts, getpass -usePBKDF2 = any(sys.platform == p for p in ["win32", "darwin"]) +usePBKDF2 = any(sys.platform == p for p in ["win32", "darwin", "cygwin"]) useCryptExt = any(sys.platform.startswith(p) for p in ["linux", "freebsd", "gnukfreebsd"]) @@ -18,7 +18,7 @@ def usage(): print("Usage: icehashpassword [options]") print("") print("OPTIONS") - + if usePBKDF2: print("") print(" -d MESSAGE_DIGEST_ALGORITHM, --digest=MESSAGE_DIGEST_ALGORITHM") @@ -106,7 +106,7 @@ def main(): # Fallback is the OS crypt function # passScheme = passlib.hosts.host_context - + if rounds: if not passScheme.min_rounds <= rounds <= passScheme.max_rounds: print("Invalid number rounds for the digest algorithm. Value must be an integer between %s and %s" % |