bcrypt_pbkdf 1.0.1.rc1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d1258a828fbd07a77a5e3d4163f0424660b203
-  data.tar.gz: 37123cada0cc78feeea6429e2e3c7b1dcf39ce08
+  metadata.gz: 6f48bfa6cb34ed011d86077b7db9e705bb767866
+  data.tar.gz: 190a384d0683bfe2c8e6de946e25ae237ea70176
 SHA512:
-  metadata.gz: 7ed28b98430c90c2f358f46c5b9bdd7de427c5960bbce793f7ac75ab19a9a0b2ebc7ee68d5bdae567dbc82a83ebbded56883499b569d88e2b94df34f69f656fc
-  data.tar.gz: eef606967079c0911a83a857512777f07df20b706cedfa6db272e3dfc15ae92a6f46989ab2eb813c03ffc613e0e28df158444a7df68568986c972369125d6966
+  metadata.gz: 011cafb3a4e5071473d07c7313ccbc01701f0ab2c50318aa2c585eefe14681379b1bbaf31f8675c3e1e8728c86402305975f467920df33cb97561a4726aae1e5
+  data.tar.gz: 881231d96178f84dcec1e2961268ec1cc38c4ce54764d0a3b1317c55d8ddebb0039e20a9258d1f59154aaf9cbceaaae67883334e902dfb3b492a7cc2b158818f

data/Gemfile.lock

@@ -1,22 +1,18 @@
 PATH
   remote: .
   specs:
-    bcrypt_pbkdf (1.0.1.rc1)
+    bcrypt_pbkdf (1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ffi (1.9.10)
-    json (1.8.3)
+    json (1.8.6)
     minitest (5.8.3)
+    openssl (2.1.2)
     rake (11.1.1)
     rake-compiler (0.9.7)
       rake
     rake-compiler-dock (0.5.3)
-    rbnacl (3.3.0)
-      ffi
-    rbnacl-libsodium (1.0.8)
-      rbnacl (~> 3.0, >= 3.0.1)
     rdoc (3.12.2)
       json (~> 1.4)
 
@@ -26,11 +22,10 @@ PLATFORMS
 DEPENDENCIES
   bcrypt_pbkdf!
   minitest (>= 5)
+  openssl
   rake-compiler (~> 0.9.7)
   rake-compiler-dock (~> 0.5.3)
-  rbnacl (~> 3.3)
-  rbnacl-libsodium (~> 1.0.8)
   rdoc (~> 3.12)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/README.md

@@ -13,3 +13,19 @@ bcrypt_pdkfd is a ruby gem implementing bcrypt_pdkfd from OpenBSD. This is curre
 
 http://www.tedunangst.com/flak/post/bcrypt-pbkdf
 http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c?rev=1.13&content-type=text/x-cvsweb-markup
+
+# Building
+
+For windows cross build make sure you checked out the gem source under the home directory
+
+```sh
+gem install rake-compiler-docks
+```
+
+```sh
+bundle exec rake compile
+bundle exec rake test
+bundle exec rake clean clobber
+bundle exec rake gem:windows
+bundle exec rake release
+```

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake/testtask'
 require 'rubygems/package_task'
+require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rake/clean'
 require 'rdoc/task'
@@ -27,7 +28,7 @@ task :default => [:compile, :spec]
 
 desc "Run all tests"
 Rake::TestTask.new do |t|
-  #t.pattern = 
+  #t.pattern =
   t.test_files = FileList['test/**/*_test.rb']
   t.ruby_opts = ['-w']
   t.libs << "test"

data/bcrypt_pbkdf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.0.1.rc1'
+  s.version = '1.0.1'
 
   s.summary = "OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
   s.description = <<-EOF
@@ -12,8 +12,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake-compiler', '~> 0.9.7'
   s.add_development_dependency 'minitest', '>= 5'
-  s.add_development_dependency 'rbnacl', '~> 3.3'
-  s.add_development_dependency 'rbnacl-libsodium', '~> 1.0.8'
+  s.add_development_dependency 'openssl'
   s.add_development_dependency 'rdoc', '~> 3.12'
   s.add_development_dependency 'rake-compiler-dock', '~> 0.5.3'
 

data/test/bcrypt_pnkdf/engine_test.rb

@@ -1,10 +1,8 @@
 require 'minitest/autorun'
 require 'test_helper'
 
-# bcrypt_pbkdf in ruby using libsodium
-require 'rbnacl/libsodium'
-require 'rbnacl'
-require 'rbnacl/hash'
+# bcrypt_pbkdf in ruby
+require 'openssl'
 
 BCRYPT_BLOCKS = 8
 BCRYPT_HASHSIZE = BCRYPT_BLOCKS * 4
@@ -13,7 +11,7 @@ def bcrypt_pbkdf(password, salt, keylen, rounds)
   stride = (keylen + BCRYPT_HASHSIZE - 1) / BCRYPT_HASHSIZE
   amt = (keylen + stride - 1) / stride
 
-  sha2pass = RbNaCl::Hash.sha512(password)
+  sha2pass = OpenSSL::Digest::SHA512.new(password).digest
   #puts "[RB] sha2pass:#{sha2pass.inspect} #{sha2pass.size}"
 
   remlen = keylen
@@ -32,13 +30,13 @@ def bcrypt_pbkdf(password, salt, keylen, rounds)
     countsalt[saltlen + 3] = (count & 0xff).chr
     #puts "[RC] countsalt: #{countsalt.inspect} len:#{countsalt.size}"
 
-    sha2salt = RbNaCl::Hash.sha512(countsalt)
+    sha2salt = OpenSSL::Digest::SHA512.new(countsalt).digest
     tmpout = BCryptPbkdf::Engine::__bc_crypt_hash(sha2pass, sha2salt)
     out = tmpout.clone
 
     #puts "[RB] out: #{out.inspect} keylen:#{remlen} count:#{count}"
     (1...rounds).each do |i|
-      sha2salt = RbNaCl::Hash.sha512(tmpout)
+      sha2salt = OpenSSL::Digest::SHA512.new(tmpout).digest
       tmpout = BCryptPbkdf::Engine::__bc_crypt_hash(sha2pass, sha2salt)
       out.bytes.each_with_index {|o,j| out.setbyte(j,o ^ tmpout[j].ord) }
     end
@@ -48,7 +46,7 @@ def bcrypt_pbkdf(password, salt, keylen, rounds)
       dest = i * stride + (count -1)
       key[dest] = out[i] if (dest < keylen)
     end
-    
+
     remlen -= amt
     count += 1
   end
@@ -66,13 +64,13 @@ class TestExt < MiniTest::Unit::TestCase
       assert_equal bcrypt_pbkdf(p,s,l,r), BCryptPbkdf::key(p,s,l,r)
     end
   end
-  
+
 
   def table
     [
-      ["pass2", "salt2", 12, 2, [214, 14, 48, 162, 131, 206, 121, 176, 50, 104, 231, 252]], 
+      ["pass2", "salt2", 12, 2, [214, 14, 48, 162, 131, 206, 121, 176, 50, 104, 231, 252]],
       ["\u0000\u0001foo", "\u0001\u0002fooo3", 14, 5, [46, 189, 32, 185, 94, 85, 232, 10, 84, 26, 44, 161, 49, 126]],
       ["doozoasd", "fooo$AS!", 14, 22, [57, 62, 50, 107, 70, 155, 65, 5, 129, 211, 189, 169, 188, 65]]
     ]
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt_pbkdf
 version: !ruby/object:Gem::Version
-  version: 1.0.1.rc1
+  version: 1.0.1
 platform: ruby
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -151,12 +137,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)