bcrypt 3.1.14 → 3.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91feef6cbd30f7651c84a8b01e8c89e0072314bef8d3d980df592c74646945fe
-  data.tar.gz: 612ec7a098b11202dcee1e2a1d24dbe5c0d00c07938e69d4bf2c26c6f4767edc
+  metadata.gz: 24a80205a939e463319b4dd986b58cd5a4d43e66e864818e0c7efa7767e25cdc
+  data.tar.gz: 964599e45299ac4964773f2ede8e6a20eab2511910fecac3512e284bfff09a1b
 SHA512:
-  metadata.gz: '08e1645f62b5b0bf9211a74d47f7660d6491ae218c073e11f135177476d33d36b267994e2ada56c10cd66e45157d3237fd3ed275f369f105e345b6e17b1cccc7'
-  data.tar.gz: 59d0d18110c202e8fddb58c97f3c6e33cafe767e6a567e02b8b0aff7ce6e9af345d723df8d59d4f7aa557a8dcc9ac22863b298e9cb37c990f5bf1514cbc32526
+  metadata.gz: 87542a66be75234db706e7f2995d4bee03e0b19611bb9bfa19e21c923656d863dfa5fadee6829e779b726a4370351734f92315f29ef8facbe89b90c930202d19
+  data.tar.gz: 6d4cd84d8e2bda4067c3816a339503257662c6f0eafcaffc7ba4aa05dacb76d4cd3d39e6c6f51951caf7f5d2ea325a81dcce374982aa3fdf57624d534b3c2ae5

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 before_install:
   - "echo 'gem: --no-rdoc --no-ri' > ~/.gemrc"
-  - gem update --system 2.7.8
-  - gem install bundler -v 1.17.3
 rvm:
   - 2.0
   - 2.1
@@ -11,6 +9,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby-head
   - rbx-3

data/CHANGELOG

@@ -1,3 +1,9 @@
+3.1.16 Sep 3 2020
+  - Fix compilation on FreeBSD. [GH #234]
+
+3.1.15 July 21 2020
+  - Remove GVL optimization.  Apparently it breaks things [GH #230]
+
 3.1.14 July 21 2020
   - Start calibration from the minimum cost supported by the algorithm [GH #206 by @sergey-alekseev]
 

data/Rakefile

@@ -50,6 +50,8 @@ end
 if RUBY_PLATFORM =~ /java/
   Rake::JavaExtensionTask.new('bcrypt_ext', GEMSPEC) do |ext|
     ext.ext_dir = 'ext/jruby'
+    ext.source_version = "1.7"
+    ext.target_version = "1.7"
   end
 else
   Rake::ExtensionTask.new("bcrypt_ext", GEMSPEC) do |ext|

data/bcrypt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt'
-  s.version = '3.1.14'
+  s.version = '3.1.16'
 
   s.summary = "OpenBSD's bcrypt() password hashing algorithm."
   s.description = <<-EOF

data/ext/mri/bcrypt_ext.c

@@ -1,50 +1,20 @@
 #include <ruby.h>
 #include <ow-crypt.h>
 
-#ifdef HAVE_RUBY_THREAD_H
-#include <ruby/thread.h>
-#endif
-
 static VALUE mBCrypt;
 static VALUE cBCryptEngine;
 
-struct bc_salt_args {
-    const char * prefix;
-    unsigned long count;
-    const char * input;
-    int size;
-};
-
-static void * bc_salt_nogvl(void * ptr) {
-    struct bc_salt_args * args = ptr;
-
-    return crypt_gensalt_ra(args->prefix, args->count, args->input, args->size);
-}
-
 /* Given a logarithmic cost parameter, generates a salt for use with +bc_crypt+.
 */
 static VALUE bc_salt(VALUE self, VALUE prefix, VALUE count, VALUE input) {
     char * salt;
     VALUE str_salt;
-    struct bc_salt_args args;
-
-    /* duplicate the parameters for thread safety.  If another thread has a
-     * reference to the parameters and mutates them while we are working,
-     * that would be very bad.  Duping the strings means that the reference
-     * isn't shared. */
-    prefix = rb_str_new_frozen(prefix);
-    input  = rb_str_new_frozen(input);
-
-    args.prefix = StringValueCStr(prefix);
-    args.count  = NUM2ULONG(count);
-    args.input  = NIL_P(input) ? NULL : StringValuePtr(input);
-    args.size   = NIL_P(input) ? 0 : RSTRING_LEN(input);
-
-#ifdef HAVE_RUBY_THREAD_H
-    salt = rb_thread_call_without_gvl(bc_salt_nogvl, &args, NULL, NULL);
-#else
-    salt = bc_salt_nogvl((void *)&args);
-#endif
+
+    salt = crypt_gensalt_ra(
+	    StringValuePtr(prefix),
+	    NUM2ULONG(count),
+	    NIL_P(input) ? NULL : StringValuePtr(input),
+	    NIL_P(input) ? 0 : RSTRING_LEN(input));
 
     if(!salt) return Qnil;
 
@@ -54,52 +24,30 @@ static VALUE bc_salt(VALUE self, VALUE prefix, VALUE count, VALUE input) {
     return str_salt;
 }
 
-struct bc_crypt_args {
-    const char * key;
-    const char * setting;
-    void * data;
-    int size;
-};
-
-static void * bc_crypt_nogvl(void * ptr) {
-    struct bc_crypt_args * args = ptr;
-
-    return crypt_ra(args->key, args->setting, &args->data, &args->size);
-}
-
 /* Given a secret and a salt, generates a salted hash (which you can then store safely).
 */
 static VALUE bc_crypt(VALUE self, VALUE key, VALUE setting) {
     char * value;
+    void * data;
+    int size;
     VALUE out;
 
-    struct bc_crypt_args args;
+    data = NULL;
+    size = 0xDEADBEEF;
 
     if(NIL_P(key) || NIL_P(setting)) return Qnil;
 
-    /* duplicate the parameters for thread safety.  If another thread has a
-     * reference to the parameters and mutates them while we are working,
-     * that would be very bad.  Duping the strings means that the reference
-     * isn't shared. */
-    key     = rb_str_new_frozen(key);
-    setting = rb_str_new_frozen(setting);
-
-    args.data    = NULL;
-    args.size    = 0xDEADBEEF;
-    args.key     = NIL_P(key)     ? NULL : StringValueCStr(key);
-    args.setting = NIL_P(setting) ? NULL : StringValueCStr(setting);
-
-#ifdef HAVE_RUBY_THREAD_H
-    value = rb_thread_call_without_gvl(bc_crypt_nogvl, &args, NULL, NULL);
-#else
-    value = bc_crypt_nogvl((void *)&args);
-#endif
+    value = crypt_ra(
+	    NIL_P(key) ? NULL : StringValuePtr(key),
+	    NIL_P(setting) ? NULL : StringValuePtr(setting),
+	    &data,
+	    &size);
 
-    if(!value || !args.data) return Qnil;
+    if(!value || !data) return Qnil;
 
-    out = rb_str_new(args.data, args.size - 1);
+    out = rb_str_new2(value);
 
-    free(args.data);
+    xfree(data);
 
     return out;
 }

data/ext/mri/wrapper.c

@@ -179,7 +179,7 @@ char *crypt_ra(const char *key, const char *setting,
 	return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
 }
 
-char *crypt_r(const char *key, const char *setting, void *data)
+char *crypt_r(const char *key, const char *setting, struct crypt_data *data)
 {
 	return _crypt_retval_magic(
 		crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),

data/lib/bcrypt/password.rb

@@ -47,7 +47,7 @@ module BCrypt
       end
 
       def valid_hash?(h)
-        h =~ /^\$[0-9a-z]{2}\$[0-9]{2}\$[A-Za-z0-9\.\/]{53}$/
+        /^\$[0-9a-z]{2}\$[0-9]{2}\$[A-Za-z0-9\.\/]{53}$/ === h
       end
     end
 

data/spec/bcrypt/password_spec.rb

@@ -116,9 +116,9 @@ end
 
 describe "Validating a password hash" do
   specify "should not accept an invalid password" do
-    expect(BCrypt::Password.valid_hash?("i_am_so_not_valid")).to be_falsey
+    expect(BCrypt::Password.valid_hash?("i_am_so_not_valid")).to be(false)
   end
   specify "should accept a valid password" do
-    expect(BCrypt::Password.valid_hash?(BCrypt::Password.create "i_am_so_valid")).to be_truthy
+    expect(BCrypt::Password.valid_hash?(BCrypt::Password.create "i_am_so_valid")).to be(true)
   end
 end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.1.16
 platform: ruby
 authors:
 - Coda Hale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+  name: rake-compiler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +25,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,10 +50,10 @@ extra_rdoc_files:
 - README.md
 - COPYING
 - CHANGELOG
+- lib/bcrypt.rb
+- lib/bcrypt/password.rb
 - lib/bcrypt/engine.rb
 - lib/bcrypt/error.rb
-- lib/bcrypt/password.rb
-- lib/bcrypt.rb
 files:
 - ".gitignore"
 - ".rspec"
@@ -61,7 +61,6 @@ files:
 - CHANGELOG
 - COPYING
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - appveyor.yml
@@ -112,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: OpenBSD's bcrypt() password hashing algorithm.

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bcrypt (3.1.14)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    rake (13.0.1)
-    rake-compiler (0.9.9)
-      rake
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bcrypt!
-  rake-compiler (~> 0.9.2)
-  rspec (>= 3)
-
-BUNDLED WITH
-   2.2.0.dev