consttime_memequal 1 → 2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7388eb1294d6b13fe781c4ab9ac3b5b25cb240
-  data.tar.gz: db1d1daa241d255fc4338a37d1c087f26fba125a
+  metadata.gz: 21438eb0c877ed5159fea334addbc864654eca7a
+  data.tar.gz: dc1bc232c52fa5cdc89a3e47a8b87d85296d96fe
 SHA512:
-  metadata.gz: b61060e7f2f889eec00aa0d9f65f59b8c33349db6ab5f21ba64072570be9222ed59433919ffd091e1762c93162da25d5ba446f053d041184eca2cb4705b4a99a
-  data.tar.gz: '079833b63df4252ef342fb764ae9708fecd4af253cb278658058739d0ead927cc84e0d9b8e2ea79d9c9dc397c73853af427b033440aedc8f85ac7681baf88cf6'
+  metadata.gz: 7c57c1357ddcd0fd13cb2f722b099a3239d41d63556de0e1fc24e7d166b8604f41183d1e752fa3b24cf0ac009f3fcf4a6e49c11ed83d7ac3b40d423d18b7fcae
+  data.tar.gz: f47543711df5e413e6790fb215a1bd1999984df556e0f207f19b2e962467aa0e85ebc3e9221d028ba744b94fceece5bddd2e346f29a66d0dcd63b2ad917bc92f

data/Gemfile

@@ -25,4 +25,7 @@
 
 source 'https://rubygems.org'
 gemspec
-gem 'openssl'
+if RUBY_VERSION >= '2.3.0'
+  gem 'openssl'
+  gem 'fiddle'
+end

data/consttime_memequal.gemspec

@@ -25,7 +25,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'consttime_memequal'
-  spec.version       = 1
+  spec.version       = 2
   spec.author        = 'Urabe, Shyouhei'
   spec.email         = 'shyouhei@ruby-lang.org'
   spec.summary       = 'provides consttime_memequal?'
@@ -41,5 +41,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry' # used in bin/console
   spec.required_ruby_version =    '>= 2.0.0'
-  spec.add_runtime_dependency     'fiddle'
 end

data/lib/consttime_memequal.rb

@@ -25,7 +25,8 @@
 
 dlsym = lambda do |symbol, lib = 'fiddle'|
   begin
-    gem lib and require lib
+    gem lib if RUBY_VERSION >= '2.3.0'
+    require lib
     libc = Fiddle.dlopen nil
     ptr  = libc.sym symbol
     func = Fiddle::Function.new ptr, \
@@ -43,7 +44,7 @@ end
 
 case
 when func = dlsym.call('consttime_memequal') then
-  define_method :consttime_memequal do |this, that, len = this.bytesize|
+  define_method :consttime_memequal? do |this, that, len = this.bytesize|
     src = Fiddle::Pointer.to_ptr this
     dst = Fiddle::Pointer.to_ptr that
     ret = func.call src, dst, len
@@ -56,7 +57,7 @@ when func = dlsym.call('consttime_memequal') then
   end
 
 when func = dlsym.call('timingsafe_memcmp') then
-  define_method :consttime_memequal do |this, that, len = this.bytesize|
+  define_method :consttime_memequal? do |this, that, len = this.bytesize|
     src = Fiddle::Pointer.to_ptr this
     dst = Fiddle::Pointer.to_ptr that
     ret = func.call src, dst, len
@@ -64,7 +65,7 @@ when func = dlsym.call('timingsafe_memcmp') then
   end
 
 when func = dlsym.call('timingsafe_bcmp') then
-  define_method :consttime_memequal do |this, that, len = this.bytesize|
+  define_method :consttime_memequal? do |this, that, len = this.bytesize|
     src = Fiddle::Pointer.to_ptr this
     dst = Fiddle::Pointer.to_ptr that
     ret = func.call src, dst, len
@@ -72,7 +73,7 @@ when func = dlsym.call('timingsafe_bcmp') then
   end
 
 when func = dlsym.call('CRYPTO_memcmp', 'openssl') then
-  define_method :consttime_memequal do |this, that, len = this.bytesize|
+  define_method :consttime_memequal? do |this, that, len = this.bytesize|
     src = Fiddle::Pointer.to_ptr this
     dst = Fiddle::Pointer.to_ptr that
     ret = func.call src, dst, len

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consttime_memequal
 version: !ruby/object:Gem::Version
-  version: '1'
+  version: '2'
 platform: ruby
 authors:
 - Urabe, Shyouhei
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Wrapper to OS-provided timing-safe memory comparison.
 email: shyouhei@ruby-lang.org
 executables: []