projects
/
snf-image
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d162824
)
Make snf-passtohash.py comply with pep8
author
Nikos Skalkotos
<skalkoto@grnet.gr>
Thu, 31 Oct 2013 16:28:28 +0000
(18:28 +0200)
committer
Nikos Skalkotos
<skalkoto@grnet.gr>
Thu, 31 Oct 2013 16:29:10 +0000
(18:29 +0200)
snf-image-helper/snf-passtohash.py
patch
|
blob
|
history
diff --git
a/snf-image-helper/snf-passtohash.py
b/snf-image-helper/snf-passtohash.py
index
6b2fb57
..
563563e
100755
(executable)
--- a/
snf-image-helper/snf-passtohash.py
+++ b/
snf-image-helper/snf-passtohash.py
@@
-34,10
+34,12
@@
from random import choice
from os.path import basename
from optparse import OptionParser
+
def random_salt(length=8):
pool = ascii_letters + digits + "/" + "."
return ''.join(choice(pool) for i in range(length))
+
METHOD = {
# Name: (algoritm, options)
'md5': (passlib.hash.md5_crypt, {}),
@@
-51,6
+53,7
@@
METHOD = {
'sha1': (passlib.hash.sha1_crypt, {})
}
+
def parse_arguments(input_args):
usage = "usage: %prog [-h] [-m encrypt-method] <password>"
parser = OptionParser(usage=usage)