diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-03 01:12:37 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-03 01:12:37 +1100 |
commit | ea708efedd7f207ce3fc05835612391816f8d4a1 (patch) | |
tree | 42bdd87aaffc48f6d92c7e6b4d748e2c8cb821fe /scripts/hash_password | |
parent | changelog (diff) | |
parent | Fix typing being reset causing infinite syncs (#4127) (diff) | |
download | synapse-ea708efedd7f207ce3fc05835612391816f8d4a1.tar.xz |
Merge branch 'develop' into matthew/heroes-for-avatars github/matthew/heroes-for-avatars matthew/heroes-for-avatars
Diffstat (limited to 'scripts/hash_password')
-rwxr-xr-x | scripts/hash_password | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/hash_password b/scripts/hash_password index 215ab25cfe..a62bb5aa83 100755 --- a/scripts/hash_password +++ b/scripts/hash_password @@ -1,12 +1,10 @@ #!/usr/bin/env python import argparse - +import getpass import sys import bcrypt -import getpass - import yaml bcrypt_rounds=12 @@ -52,4 +50,3 @@ if __name__ == "__main__": password = prompt_for_pass() print bcrypt.hashpw(password + password_pepper, bcrypt.gensalt(bcrypt_rounds)) - |