bcrypt 3.1.14-java → 3.1.15-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9581d38b9f8ace7c8c0ef1a7a9e4a73dd1c4326392de7147dfe2a51e42c5b9a0
-  data.tar.gz: 2aedddb181acd0cdf6d3506f78c20148057968e8c53d89a90778673aa825e271
+  metadata.gz: daebd0457608f18460625651148836dac8c525da398e08e75cb97244f6e19003
+  data.tar.gz: bc87d1670e61c2e420e610f3f32ae5159560b6d6171617a35cb78d9efc18a6f8
 SHA512:
-  metadata.gz: 60a8e9c4381fc55f5323204391d0f2c5c17bb0e2b0660d43db58c124c1aaceb29cd03b3e565ad48796d71da94aa1d049ad5ab24eb61bbc30a429a22b74a94961
-  data.tar.gz: 7a8c99a0ac391f11cb55d7e8ce12125f6892aaea701c4c26ffbdc486a8cd87b3215e5f7a903ef063c36d4954fa262c13ab40f086b0f5a8d8f8d60f87b0daeb13
+  metadata.gz: f18e30c92f9b3297e325c6c24f7466ad108f71d0fc1584d886b23d8cdb4408ef94a0c479cb1266e54f91f81ca9090dbd2109378724881a264fc6140c734e4fa7
+  data.tar.gz: 7ca77307a151d8ecedd50b9cba02ed3b3e34ff2a1c80ba05656f007f1eb161064cabdbf0267a6024819397c04c707ed7ab6e27f643b80879c14e1ed4c59479f0

data/CHANGELOG

@@ -1,3 +1,6 @@
+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/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bcrypt (3.1.14)
+    bcrypt (3.1.15)
 
 GEM
   remote: https://rubygems.org/

data/bcrypt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt'
-  s.version = '3.1.14'
+  s.version = '3.1.15'
 
   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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.1.15
 platform: java
 authors:
 - Coda Hale