argon2id 0.7.0-java → 0.8.0.rc1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c55593bcbc6cf76d949f2f587ce63eb889f9fa06f7a054adb25b1369e36398
-  data.tar.gz: 85354c4570b9266deaf39384bed27bf08091850b73d5cdeadb646af47aa29e01
+  metadata.gz: 6f3e4f92843ded78b7740f56525faee59bc2666047c786efce664f20fe651563
+  data.tar.gz: a03c928369e5d060d6809f813c94d3b269713f68a24026dfe7dd79eb3270a46a
 SHA512:
-  metadata.gz: 2a9bb956f5d0aeadde01d2cf994d417573a7b24b3e53d74f1f66c90b0def02799bc7e23e8b721c10caaa7d1b7b63230b5ae56d9847261544db96254184215b8b
-  data.tar.gz: 3470403d3516979b84407c0092c15b5f9458bb99df66309ffb8e0345722a9e56965e6a59109305e322809de0f6db2f9bdf9bc0a7b61c29101a0eb5e9d971eb2f
+  metadata.gz: 9de337063948c1bef73e0ec6519d831f11e53d94c47ab5524796c46d32973dc41f617dab908314143dfdebe3dbe393214facd5955af624d258129e6bb87b8a0c
+  data.tar.gz: dc7ab66fbff2737565eaa592d18ac3d9cbfa8e22b3edac8d3070e629f753cd69baad28ed6ebcee0d1a9a9de3434be861c5c60ea131971b5a88f2efacf08fe4c0

data/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.0.rc1] - 2024-12-16
+
+### Added
+
+- Add Ruby 3.4.0-rc1 support to the precompiled, native gems
+
+### Changed
+
+- Provide separate precompiled, native gems for GNU and Musl
+- Require glibc 2.29+ for x86-linux-gnu and x86_64-linux-gnu (and recommend
+  RubyGems 3.3.22+ and Bundler 2.3.21+)
+
+### Removed
+
+- Drop support for Ruby versions older than 3.1 as they do not ship with a
+  version of RubyGems new enough to handle the new Musl gems
+
 ## [0.7.0] - 2024-11-08
 
 ### Fixed
@@ -111,6 +128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   reference C implementation of Argon2, the password-hashing function that won
   the Password Hashing Competition.
 
+[0.8.0.rc1]: https://github.com/mudge/argon2id/releases/tag/v0.8.0.rc1
 [0.7.0]: https://github.com/mudge/argon2id/releases/tag/v0.7.0
 [0.6.0]: https://github.com/mudge/argon2id/releases/tag/v0.6.0
 [0.5.0]: https://github.com/mudge/argon2id/releases/tag/v0.5.0

data/README.md

@@ -5,7 +5,7 @@ Ruby bindings to [Argon2][], the password-hashing function that won the 2015
 
 [![Build Status](https://github.com/mudge/argon2id/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/argon2id/actions)
 
-**Current version:** 0.7.0  
+**Current version:** 0.8.0.rc1  
 **Bundled Argon2 version:** libargon2.1 (20190702)
 
 ```ruby
@@ -28,6 +28,7 @@ password.salt   #=> "e-\xA7\x04U\x81\xA6{v\xF0x\xED\xCC\xD3\x96\xE3"
     * [Verifying passwords](#verifying-passwords)
     * [Validating encoded hashes](#validating-encoded-hashes)
     * [Errors](#errors)
+    * [Usage with Active Record](#usage-with-active-record)
 * [Requirements](#requirements)
     * [Native gems](#native-gems)
     * [Verifying the gems](#verifying-the-gems)
@@ -196,11 +197,67 @@ Argon2id::Password.create("password", salt_len: 0)
 # Salt is too short (Argon2id::Error)
 ```
 
+### Usage with Active Record
+
+If you're planning to use this with Active Record instead of [Rails' own
+bcrypt-based
+`has_secure_password`](https://api.rubyonrails.org/v8.0/classes/ActiveModel/SecurePassword/ClassMethods.html),
+you can use the following as a starting point:
+
+#### The `User` model
+
+```ruby
+require "argon2id"
+
+# Schema: User(name: string, password_digest:string)
+class User < ApplicationRecord
+  attr_reader :password
+
+  validates :password_digest, presence: true
+  validates :password, confirmation: true, allow_blank: true
+
+  def password=(unencrypted_password)
+    if unencrypted_password.nil?
+      @password = nil
+      self.password_digest = nil
+    elsif !unencrypted_password.empty?
+      @password = unencrypted_password
+      self.password_digest = Argon2id::Password.create(unencrypted_password)
+    end
+  end
+
+  def authenticate(unencrypted_password)
+    password_digest? && Argon2id::Password.new(password_digest).is_password?(unencrypted_password) && self
+  end
+
+  def password_salt
+    Argon2id::Password.new(password_digest).salt if password_digest?
+  end
+end
+```
+
+This can then be used like so:
+
+```ruby
+user = User.new(name: "alice", password: "", password_confirmation: "diffpassword")
+user.save                               #=> false, password required
+user.password = "password"
+user.save                               #=> false, confirmation doesn't match
+user.password_confirmation = "password"
+user.save                               #=> true
+
+user.authenticate("notright") #=> false
+user.authenticate("password") #=> user
+
+User.find_by(name: "alice")&.authenticate("notright") #=> false
+User.find_by(name: "alice")&.authenticate("password") #=> user
+```
+
 ## Requirements
 
 This gem requires any of the following to run:
 
-* [Ruby](https://www.ruby-lang.org/en/) 2.6 to 3.3
+* [Ruby](https://www.ruby-lang.org/en/) 3.1 to 3.4.0-rc1
 * [JRuby](https://www.jruby.org) 9.4
 * [TruffleRuby](https://www.graalvm.org/ruby/) 24.1
 
@@ -214,11 +271,10 @@ This gem requires any of the following to run:
 Where possible, a pre-compiled native gem will be provided for the following platforms:
 
 * Linux
-    * `aarch64-linux` and `arm-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+)
-    * `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.17+)
-    * [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported as long as a [glibc-compatible library is installed](https://wiki.alpinelinux.org/wiki/Running_glibc_programs)
+    * `aarch64-linux`, `arm-linux`, `x86-linux`, `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+, RubyGems 3.3.22+ and Bundler 2.3.21+)
+    * [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported with Bundler 2.5.6+
 * macOS `x86_64-darwin` and `arm64-darwin`
-* Windows `x64-mingw32` and `x64-mingw-ucrt`
+* Windows `x64-mingw-ucrt`
 * Java: any platform running JRuby 9.4 or higher
 
 ### Verifying the gems
@@ -228,11 +284,11 @@ notes](https://github.com/mudge/argon2id/releases) for each version and can be
 checked with `sha256sum`, e.g.
 
 ```console
-$ gem fetch argon2id -v 0.6.0
-Fetching argon2id-0.6.0-arm64-darwin.gem
-Downloaded argon2id-0.6.0-arm64-darwin
-$ sha256sum argon2id-0.6.0-arm64-darwin.gem
-18f1f04be4b5e7badb4d491762e57874febeeb46c64ce1b0a5e3a75b39b5baeb  argon2id-0.6.0-arm64-darwin.gem
+$ gem fetch argon2id -v 0.7.0
+Fetching argon2id-0.7.0-arm64-darwin.gem
+Downloaded argon2id-0.7.0-arm64-darwin
+$ sha256sum argon2id-0.7.0-arm64-darwin.gem
+26bba5bcefa56827c728222e6df832aef5c8c4f4d3285875859a1d911477ec68  argon2id-0.7.0-arm64-darwin.gem
 ```
 
 [GPG](https://www.gnupg.org/) signatures are attached to each release (the
@@ -242,8 +298,8 @@ from a public keyserver, e.g. `gpg --keyserver keyserver.ubuntu.com --recv-key
 0x39AC3530070E0F75`):
 
 ```console
-$ gpg --verify argon2id-0.6.0-arm64-darwin.gem.sig argon2id-0.6.0-arm64-darwin.gem
-gpg: Signature made Tue  5 Nov 11:30:47 2024 GMT
+$ gpg --verify argon2id-0.7.0-arm64-darwin.gem.sig argon2id-0.7.0-arm64-darwin.gem
+gpg: Signature made Fri  8 Nov 13:45:18 2024 GMT
 gpg:                using RSA key 702609D9C790F45B577D7BEC39AC3530070E0F75
 gpg: Good signature from "Paul Mucur <mudge@mudge.name>" [unknown]
 gpg:                 aka "Paul Mucur <paul@ghostcassette.com>" [unknown]

data/Rakefile

@@ -5,18 +5,22 @@ require "minitest/test_task"
 CLEAN.add("lib/**/*.{o,so,bundle}", "pkg")
 
 cross_platforms = %w[
-  aarch64-linux
-  arm-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
   arm64-darwin
   x64-mingw-ucrt
   x64-mingw32
-  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
   x86-mingw32
   x86_64-darwin
-  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 ].freeze
 
-ENV["RUBY_CC_VERSION"] = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(":")
+ENV["RUBY_CC_VERSION"] = %w[3.4.0 3.3.5 3.2.0 3.1.0].join(":")
 
 gemspec = Gem::Specification.load("argon2id.gemspec")
 

data/argon2id.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/mudge/argon2id",
     "rubygems_mfa_required" => "true"
   }
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 3.1.0"
   s.extensions = ["ext/argon2id/extconf.rb"]
   s.files = [
     "CHANGELOG.md",
@@ -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.5")
+  s.add_development_dependency("rake-compiler-dock", "~> 1.7.0.rc1")
   s.add_development_dependency("minitest", "~> 5.25")
 end

data/lib/argon2id/extension.rb

@@ -15,10 +15,11 @@ if RUBY_PLATFORM == "java"
         output = Java::byte[hashlen].new
         params = Java::OrgBouncycastleCryptoParams::Argon2Parameters::Builder
           .new(Java::OrgBouncycastleCryptoParams::Argon2Parameters::ARGON2_id)
-          .with_salt(salt_bytes)
-          .with_parallelism(parallelism)
-          .with_memory_as_kb(m_cost)
+          .with_version(Java::OrgBouncycastleCryptoParams::Argon2Parameters::ARGON2_VERSION_13)
           .with_iterations(t_cost)
+          .with_memory_as_kb(m_cost)
+          .with_parallelism(parallelism)
+          .with_salt(salt_bytes)
           .build
         generator = Java::OrgBouncycastleCryptoGenerators::Argon2BytesGenerator.new
 
@@ -43,11 +44,11 @@ if RUBY_PLATFORM == "java"
         other_output = Java::byte[output.bytesize].new
         params = Java::OrgBouncycastleCryptoParams::Argon2Parameters::Builder
           .new(Java::OrgBouncycastleCryptoParams::Argon2Parameters::ARGON2_id)
-          .with_salt(salt.to_java_bytes)
-          .with_parallelism(parallelism)
-          .with_memory_as_kb(m_cost)
-          .with_iterations(t_cost)
           .with_version(version)
+          .with_iterations(t_cost)
+          .with_memory_as_kb(m_cost)
+          .with_parallelism(parallelism)
+          .with_salt(salt.to_java_bytes)
           .build
         generator = Java::OrgBouncycastleCryptoGenerators::Argon2BytesGenerator.new
         generator.init(params)

data/lib/argon2id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Argon2id
-  VERSION = "0.7.0"
+  VERSION = "0.8.0.rc1"
 end

data/test/argon2id/test_password.rb

@@ -386,6 +386,12 @@ class TestPassword < Minitest::Test
     assert_instance_of Argon2id::Password, password
   end
 
+  def test_create_password_uses_version_13
+    password = Argon2id::Password.create("password")
+
+    assert_equal 0x13, password.version
+  end
+
   def test_create_password_uses_default_t_cost
     password = Argon2id::Password.create("password")
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: argon2id
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0.rc1
 platform: java
 authors:
 - Paul Mucur
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.0.rc1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +53,6 @@ dependencies:
         version: '5.25'
 description: Ruby bindings to Argon2, the password-hashing function that won the 2015
   Password Hashing Competition.
-email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,7 +79,6 @@ metadata:
   homepage_uri: https://github.com/mudge/argon2id
   source_code_uri: https://github.com/mudge/argon2id
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -98,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Ruby bindings to Argon2
 test_files: []