bcrypt_pbkdf 1.0.1.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94d1258a828fbd07a77a5e3d4163f0424660b203
-  data.tar.gz: 37123cada0cc78feeea6429e2e3c7b1dcf39ce08
+SHA256:
+  metadata.gz: 63ac8948f4ecd73d2450a88ffe9c4cba42c00046ac292841be016965eb5834e4
+  data.tar.gz: 34bf1a1d2025f60d29db8dacb052df7264262cd22f5d0b480d0fdafe01fe8f8c
 SHA512:
-  metadata.gz: 7ed28b98430c90c2f358f46c5b9bdd7de427c5960bbce793f7ac75ab19a9a0b2ebc7ee68d5bdae567dbc82a83ebbded56883499b569d88e2b94df34f69f656fc
-  data.tar.gz: eef606967079c0911a83a857512777f07df20b706cedfa6db272e3dfc15ae92a6f46989ab2eb813c03ffc613e0e28df158444a7df68568986c972369125d6966
+  metadata.gz: 37d7691812403f03b69d32fe8ad1539fa94368df4cf94b2dce9821b516727c3252f7e26f62f4f08fd3eb60f09e01b5ff734b6484aa86e85d4d80884498dd209a
+  data.tar.gz: 7f4e906f1f7a1b14008b789f23d2e0e3bab121c405051b41fd472193d1c38bd12e132e51177a0e3c84a45e47ecebc4021d3dc878fadfbc17e56a06883ea75e68

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
+arch:
+  - amd64
+  - ppc64le
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
   - 2.3.0
-  - rbx-2
+  - 2.4.0
+  - 2.5.0
+  - 2.6.0
+  - 2.7.0
 script: bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
-# bcrypt_pdkfd-ruby
+# bcrypt_pbkdf-ruby
 
-bcrypt_pdkfd is a ruby gem implementing bcrypt_pdkfd from OpenBSD. This is currently used by net-ssh to read password encrypted Ed25519 keys.
+bcrypt_pbkdf is a ruby gem implementing bcrypt_pbkdf from OpenBSD. This is currently used by net-ssh to read password encrypted Ed25519 keys.
 
 [![Build Status](https://travis-ci.org/mfazekas/bcrypt_pbkdf-ruby.png?branch=master)](https://travis-ci.org/mfazekas/bcrypt_pbkdf-ruby)
 
@@ -13,3 +13,20 @@ 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-dock
+```
+
+```sh
+bundle exec rake compile
+bundle exec rake test
+bundle exec rake clean clobber
+bundle exec rake gem:windows
+bundle exec rake release
+bundle exec rake gem:windows:release
+```

data/Rakefile

@@ -1,14 +1,23 @@
 require 'rake/testtask'
 require 'rubygems/package_task'
+require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rake/clean'
 require 'rdoc/task'
 require 'benchmark'
 
+
 CLEAN.include(
   "tmp",
   "lib/2.0",
   "lib/2.1",
+  "lib/2.2",
+  "lib/2.3",
+  "lib/2.4",
+  "lib/2.5",
+  "lib/2.6",
+  "lib/2.7",
+  "lib/3.0",
   "lib/bcrypt_pbkdf_ext.so"
 )
 CLOBBER.include(
@@ -18,7 +27,14 @@ CLOBBER.include(
 
 task 'gem:windows' do
   require 'rake_compiler_dock'
-  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.3.0:2.2.2:2.1.6:2.0.0"
+  sh "bundle package"   # Avoid repeated downloads of gems by using gem files from the host.
+  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
+end
+
+task 'gem:windows:release' do
+  version = Gem::Specification::load("bcrypt_pbkdf.gemspec").version
+  sh "gem push pkg/bcrypt_pbkdf-#{version}-x86-mingw32.gem"
+  sh "gem push pkg/bcrypt_pbkdf-#{version}-x64-mingw32.gem"
 end
 
 GEMSPEC = Gem::Specification.load("bcrypt_pbkdf.gemspec")
@@ -27,7 +43,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,21 +1,20 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.0.1.rc1'
+  s.version = '1.1.0'
 
-  s.summary = "OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
+  s.summary = "OpenBSD's bcrypt_pbkdf (a variant of PBKDF2 with bcrypt-based PRF)"
   s.description = <<-EOF
-    This gem implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
+    This gem implements bcrypt_pbkdf (a variant of PBKDF2 with bcrypt-based PRF)
   EOF
 
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.add_development_dependency 'rake-compiler', '~> 0.9.7'
+  s.add_development_dependency 'rake-compiler', '~> 1.1.0'
   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'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.0.1'
 
   s.has_rdoc = true
   s.rdoc_options += ['--title', 'bcrypt_pbkdf', '--line-numbers', '--inline-source', '--main', 'README.md']

data/ext/mri/bcrypt_pbkdf_ext.c

@@ -8,7 +8,7 @@ static VALUE cBCryptPbkdfEngine;
 */
 static VALUE bc_crypt_pbkdf(VALUE self, VALUE pass, VALUE salt, VALUE keylen, VALUE rounds) {
   size_t okeylen = NUM2ULONG(keylen);
-  u_int8_t* okey = xmalloc(keylen);
+  u_int8_t* okey = xmalloc(okeylen);
   VALUE out;
 
   int ret = bcrypt_pbkdf(

data/ext/mri/sha2.h

@@ -7,7 +7,7 @@
 #endif
 #define SHA512_DIGEST_LENGTH crypto_hash_sha512_BYTES
 
-inline void SHA512Init(SHA2_CTX* ctx) { crypto_hash_sha512_init(ctx); }
-inline void SHA512Update(SHA2_CTX* ctx, const void *in, size_t inlen) { crypto_hash_sha512_update(ctx, in, inlen); }
-inline void SHA512Final(uint8_t* out, SHA2_CTX* ctx) { crypto_hash_sha512_final(ctx, out); }
+inline static void SHA512Init(SHA2_CTX* ctx) { crypto_hash_sha512_init(ctx); }
+inline static void SHA512Update(SHA2_CTX* ctx, const void *in, size_t inlen) { crypto_hash_sha512_update(ctx, in, inlen); }
+inline static void SHA512Final(uint8_t* out, SHA2_CTX* ctx) { crypto_hash_sha512_final(ctx, out); }
 

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.1.0
 platform: ruby
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -86,15 +72,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
-description: "    This gem implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based
+        version: 1.0.1
+description: "    This gem implements bcrypt_pbkdf (a variant of PBKDF2 with bcrypt-based
   PRF)\n"
 email: mfazekas@szemafor.com
 executables: []
@@ -110,7 +96,6 @@ files:
 - CHANGELOG.md
 - COPYING
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bcrypt_pbkdf.gemspec
@@ -151,13 +136,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: 3.0.3
 signing_key: 
 specification_version: 4
-summary: OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
+summary: OpenBSD's bcrypt_pbkdf (a variant of PBKDF2 with bcrypt-based PRF)
 test_files: []

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bcrypt_pbkdf (1.0.1.rc1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.9.10)
-    json (1.8.3)
-    minitest (5.8.3)
-    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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bcrypt_pbkdf!
-  minitest (>= 5)
-  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