bcrypt_pbkdf 1.0.0-x64-mingw32 → 1.0.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b57505bd496a5217b20bd7f7b869bb9253591fc
-  data.tar.gz: f19d53707b3f8d055227ae93215a19c1f31b1217
+  metadata.gz: 85160261ec87f3956362d07efae594eb10f2e6f2
+  data.tar.gz: 48b933dba75b5da8117acc4e5116af3bf00902f6
 SHA512:
-  metadata.gz: a073176b163c9bfd17d29eb2c29d695a1eb5ec7785d353f5e649754ace51826153062a1e7dfc7db0b81858911c8502e926e0d470ddbf59963105d472d37c3e24
-  data.tar.gz: 20823d9a7bbbf1666141a6f04c5c97337a7c65242ed3c7d74f3c2fb4c7bfaf86f7f79083703dc46359b8acce180265a69cd873888e3046b18614d6c1c644083e
+  metadata.gz: fcabd199e67fe8b75f977f0eea45be741f4487e9b77f1977e0b57e222ed7b3ba9467048ef9e2641a440bf32f0df2f5af8e55bb05a745c434284c5256be7cd29e
+  data.tar.gz: 41e9ce71bdfed07ad40d567ed5b40b98be83773724fd86bb0a75752f9c787874a7e193ae9263f7c1939dd83fa5a7909e75ff4feee0f5091f4fa8326a9838cecc

data/CHANGELOG.md

@@ -1,3 +1,3 @@
 # 1.0.0.apha1
 
-  inital version
+  initial version

data/Gemfile.lock

@@ -1,22 +1,18 @@
 PATH
   remote: .
   specs:
-    bcrypt_pbkdf (1.0.0)
+    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.13.6
+   1.17.3

data/README.md

@@ -13,3 +13,18 @@ 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
+```

data/bcrypt_pbkdf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.0.0'
+  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/ext/mri/includes.h

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || (defined(__sun) && defined(__SVR4))
 
 typedef uint8_t u_int8_t;
 typedef uint16_t u_int16_t;

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.0
+  version: 1.0.1
 platform: x64-mingw32
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 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