From 145051136877a552afdb28a31285ae45afd01454 Mon Sep 17 00:00:00 2001 From: Thomas Sawyer Date: Tue, 17 Nov 2026 14:46:10 -0500 Subject: [PATCH] Make Crypt3's salt from SecureRandom generate_salt used rand, which isn't a cryptographic source and follows srand. Facets already uses SecureRandom for salted digests. Co-Authored-By: Claude Fable 5.2 --- HISTORY.md | 3 +++ lib/standard/facets/crypt3.rb | 6 ++++-- test/standard/test_crypt3.rb | 8 ++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 04168e16..bc2c29a2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -36,6 +36,9 @@ Changes: it is given. * `Array#delete_first` now returns the block's result when the item isn't found, as its docs say and as `Array#delete` does. + * `Crypt3.generate_salt`, and so the salt `Crypt3.crypt` makes when + given none, now comes from `SecureRandom`. It came from `rand`, which + isn't a cryptographic source. * Documentation diff --git a/lib/standard/facets/crypt3.rb b/lib/standard/facets/crypt3.rb index f80eb078..f0fd14cf 100644 --- a/lib/standard/facets/crypt3.rb +++ b/lib/standard/facets/crypt3.rb @@ -1,3 +1,5 @@ +require 'securerandom' + # Crypt3 is a pure Ruby version of crypt(3), a salted one-way hashing # of a password. # @@ -112,7 +114,7 @@ def self.check(password, hash, algo = :md5) self.crypt(password, algo, salt, magic) == hash end - # Generate a random salt of the given size. + # Generate a random salt of the given size, from SecureRandom. # # Crypt3.generate_salt(8) #=> "xK3d9Wq2" # @@ -120,7 +122,7 @@ def self.check(password, hash, algo = :md5) # # Returns random salt. [String] def self.generate_salt(size) - (1..size).map { ITOA64[rand(ITOA64.size)] }.join + (1..size).map { ITOA64[SecureRandom.random_number(ITOA64.size)] }.join end end diff --git a/test/standard/test_crypt3.rb b/test/standard/test_crypt3.rb index 9f35e7e3..441d8c45 100644 --- a/test/standard/test_crypt3.rb +++ b/test/standard/test_crypt3.rb @@ -86,6 +86,14 @@ Crypt3.generate_salt(16).size.assert == 16 end + test "does not come from Kernel#rand" do + srand(1) + a = Crypt3.generate_salt(16) + srand(1) + b = Crypt3.generate_salt(16) + a.refute == b + end + test "uses only the crypt(3) base 64 characters" do Crypt3.generate_salt(200).delete(Crypt3::ITOA64).assert == '' end