diff options
| author | mh <mh@immerda.ch> | 2011-12-17 15:09:50 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-12-17 15:09:50 +0100 |
| commit | 615d346cc72c523c822c03ed1a47ffd47680d6ff (patch) | |
| tree | 1aba9aee129b3bd11fbe744a5f8aa09f1eef187e /lib | |
| parent | 32f5c0adea3911a5619656a4b346feff46b0c9a8 (diff) | |
| parent | 16158840cd12bcb74574eeb5104a8b3f3ec61305 (diff) | |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/trocla/formats/md5crypt.rb | 4 | ||||
| -rw-r--r-- | lib/trocla/formats/sha256crypt.rb | 2 | ||||
| -rw-r--r-- | lib/trocla/formats/sha512crypt.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/trocla/formats/md5crypt.rb b/lib/trocla/formats/md5crypt.rb index f52e2a1..36e3a3c 100644 --- a/lib/trocla/formats/md5crypt.rb +++ b/lib/trocla/formats/md5crypt.rb @@ -1,6 +1,6 @@ # salted crypt class Trocla::Formats::Md5crypt def format(plain_password,options={}) - plain_password.crypt('$1$' << Trocla::Util.random_str(8) << '$') + plain_password.crypt('$1$' << Trocla::Util.salt << '$') end -end
\ No newline at end of file +end diff --git a/lib/trocla/formats/sha256crypt.rb b/lib/trocla/formats/sha256crypt.rb index fe6659c..6bd1b72 100644 --- a/lib/trocla/formats/sha256crypt.rb +++ b/lib/trocla/formats/sha256crypt.rb @@ -1,6 +1,6 @@ # salted crypt class Trocla::Formats::Sha256crypt def format(plain_password,options={}) - plain_password.crypt('$5$' << Trocla::Util.random_str(8) << '$') + plain_password.crypt('$5$' << Trocla::Util.salt << '$') end end diff --git a/lib/trocla/formats/sha512crypt.rb b/lib/trocla/formats/sha512crypt.rb index d57b93d..d2725c1 100644 --- a/lib/trocla/formats/sha512crypt.rb +++ b/lib/trocla/formats/sha512crypt.rb @@ -1,6 +1,6 @@ # salted crypt class Trocla::Formats::Sha512crypt def format(plain_password,options={}) - plain_password.crypt('$6$' << Trocla::Util.random_str(8) << '$') + plain_password.crypt('$6$' << Trocla::Util.salt << '$') end end |