Skip to content

Use RakeCompilerDock.set_ruby_cc_version #13

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
mudge merged 2 commits into from
Feb 28, 2025
Merged

Use RakeCompilerDock.set_ruby_cc_version #13

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
6378086
Use RakeCompilerDock.set_ruby_cc_version
mudge Feb 28, 2025
c8b915e
Add explicit validation of memory cost on JRuby
mudge Feb 28, 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
3 changes: 2 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cross_platforms = %w[
x86_64-linux-musl
].freeze

ENV["RUBY_CC_VERSION"] = "3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10"
RakeCompilerDock.set_ruby_cc_version("~> 2.6", "~> 3.0")

gemspec = Gem::Specification.load("argon2id.gemspec")

Expand Down Expand Up @@ -59,6 +59,7 @@ namespace :gem do
desc "Compile and build native gem for #{platform}"
task platform do
RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
rbenv shell 3.1.6 &&
gem install bundler --no-document &&
bundle &&
bundle exec rake native:#{platform} pkg/#{gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion argon2id.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--main", "README.md"]

s.add_development_dependency("rake-compiler", "~> 1.2")
s.add_development_dependency("rake-compiler-dock", "~> 1.8")
s.add_development_dependency("rake-compiler-dock", "~> 1.9")
s.add_development_dependency("minitest", "~> 5.25")
end
1 change: 1 addition & 0 deletions lib/argon2id/extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module Argon2id
class Password
def self.hash_encoded(t_cost, m_cost, parallelism, pwd, salt, hashlen)
raise Error, "Salt is too short" if salt.empty?
raise Error, "Memory cost is too small" if m_cost < 8

salt_bytes = salt.to_java_bytes
output = Java::byte[hashlen].new
Expand Down