Skip to content

Use Slice literals in Crypto::Bcrypt #15781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
straight-shoota merged 2 commits into from
May 23, 2025
+383 −186
Merged

Use Slice literals in Crypto::Bcrypt #15781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf4f8c
Use slice literals in `Crypto::Bcrypt`
HertzDevil May 16, 2025
0a2d13a
fixup
HertzDevil May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/crypto/bcrypt.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,17 @@ class Crypto::Bcrypt
private DIGEST_SIZE = 31

# bcrypt IV: "OrpheanBeholderScryDoubt"
private CIPHER_TEXT = UInt32.static_array(
0x4f727068, 0x65616e42, 0x65686f6c,
0x64657253, 0x63727944, 0x6f756274,
)
{% if compare_versions(Crystal::VERSION, "1.16.0") >= 0 %}
private CIPHER_TEXT = Slice(UInt32).literal(
0x4f727068, 0x65616e42, 0x65686f6c,
0x64657253, 0x63727944, 0x6f756274,
)
{% else %}
private CIPHER_TEXT = UInt32.static_array(
0x4f727068, 0x65616e42, 0x65686f6c,
0x64657253, 0x63727944, 0x6f756274,
)
{% end %}

# Hashes the *password* using bcrypt algorithm using salt obtained via `Random::Secure.random_bytes(SALT_SIZE)`.
#
Expand Down Expand Up @@ -126,7 +133,8 @@ class Crypto::Bcrypt
blowfish = Blowfish.new(BLOWFISH_ROUNDS)
blowfish.enhance_key_schedule(salt, password, cost)

cipher = CIPHER_TEXT.dup
cipher = uninitialized UInt32[6]
cipher.to_slice.copy_from(CIPHER_TEXT.to_slice)
cdata = cipher.to_unsafe

0.step(to: 4, by: 2) do |i|
Expand Down
Loading
Loading