crypt_checkpass 2 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c78a28d5c63b16c2ed28cbc183e8c92885fabd2
-  data.tar.gz: 64bcd424fb5ee0bb15e646ec522fdec98c67f106
+  metadata.gz: 71ca5cf785b2cee6228688661a1f0e0240dfb709
+  data.tar.gz: 41b818c7453c0837043947bd59311671b4587b93
 SHA512:
-  metadata.gz: a6b2ca0a274bc8331b0c2df7b3b774f1c778cc3687705088e1315d480301998ae0f9b9e75813694382ee54c5f6d25815a19cb53e0c84d382086d83c123e8dd68
-  data.tar.gz: 607b6f1ae9883d3372e4abaf5a15b87c132cf5972d4c6a1180ec972afce8b6f7aedc2ccaa7d6f6b4aae5ea372e8e13c63978bd6fbe52e71f1471b5ba9b010b4e
+  metadata.gz: 6c9056c681614f35bd941f70f4f570132897bc9a03fe43591e1d668998793289690ebb8fe743b94c4b3d900349c804e3b008768e5bf5597216c16de62c16746f
+  data.tar.gz: e1cee36b81f2ba4741da6b3f9f91696b730671d5d9de08b0560bf58f055a8c214dbf0b3c89c6cba18a79c9fbe66f1ef289114b50631721296f41667f1bcec14e

data/Gemfile

@@ -38,4 +38,7 @@ group :test do
     gem 'fiddle'
     gem 'openssl'
   end
+  if RUBY_VERSION < '2.4.0'
+    gem 'activesupport', '= 5.2.0'
+  end
 end

data/README.md

@@ -86,7 +86,7 @@ is bad to use in contemporary programs for several reasons:
   the parameter(salt), by hand.  Failure in generation of a proper
   salt string tends not to yield any errors; for instance typo in
   parameters are normally not detectable.
-    - For instance, in the following example, second invokation of
+    - For instance, in the following example, second invocation of
       `String#crypt` is wrong; it has typo in "round=" (lacks "s").
       However the call does not fail and something unexpected is
       generated.
@@ -98,9 +98,9 @@ is bad to use in contemporary programs for several reasons:
 
 - Even in the "modular" mode, some hash functions are considered
   archaic and no longer recommended at all; for instance module `$1$`
-  is officially abondoned by its author:
+  is officially abandoned by its author:
   http://phk.freebsd.dk/sagas/md5crypt_eol.html, for another instance
-  module `$3$` is consodered completely broken: see the manpage of
+  module `$3$` is considered completely broken: see the manpage of
   FreeBSD.
 - On some OS such as Mac OS, there is no modular mode. Yet, as written
   above, `String#crypt` on Mac OS never fails.  This means even if you

data/crypt_checkpass.gemspec

@@ -25,7 +25,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'crypt_checkpass'
-  spec.version       = 2
+  spec.version       = 3
   spec.author        = 'Urabe, Shyouhei'
   spec.email         = 'shyouhei@ruby-lang.org'
   spec.summary       = 'provides crypt_checkpass / crypt_newhash'

data/lib/crypt_checkpass/api.rb

@@ -172,7 +172,7 @@ class << CryptCheckpass
     # @param str [String] target string to test.
     # @return    [true]   accepted.
     # @return    [false]  otherwise.
-    def match? re, str
+    def match? str, re
       return re.match? str
     end
   else
@@ -181,7 +181,7 @@ class << CryptCheckpass
     # @param str [String] target string to test.
     # @return    [true]   accepted.
     # @return    [false]  otherwise.
-    def match? re, str
+    def match? str, re
       md = re.match str
       return !!md
     end

data/lib/crypt_checkpass/pbkdf2.rb

@@ -37,7 +37,7 @@
 #
 #   - `password` is the raw binary password that you want to digest.
 #
-#   - `id`  is "pbkdf2-{digest}".   You can  specify  sha1 /  sha256 /  sha512.
+#   - `id` is  `"pbkdf2-{digest}"`.  You  can specify sha1  / sha256  / sha512.
 #     Unlike plain SHA1, PBKDF2 + SHA1  combination still has no known weakness
 #     as of writing so specifying pbkdf-sha1 should just suffice normally.
 #
@@ -65,9 +65,6 @@
 # }x
 # ```
 #
-# - This is a strict PHC string format. See also
-#   {CryptCheckpass::PHCStringFormat}
-#
 # - The `id` can either be "pbkdf2-sha1", "pbkdf2-sha256", or "pbkdf2-sha512".
 #
 # - The only parameter `i` is the iteration (rounds) of the calculation.

data/lib/crypt_checkpass/scrypt.rb

@@ -85,9 +85,6 @@ require 'securerandom'
 # }x
 # ```
 #
-# - This is a strict PHC string format. See also
-#   {CryptCheckpass::PHCStringFormat}
-#
 # - Parameters are `ln`, `r`, and `p` where `ln` deontes log2(N).
 #
 # ### Other formats:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypt_checkpass
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '3'
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: provides crypt_checkpass / crypt_newhash