bcrypt_pbkdf 1.0.0.alpha1-x86-mingw32 → 1.1.0.rc2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9336cea99876ad41a3a67958ce8954432fe69246
-  data.tar.gz: 3460d0484b454f959a1ff217ffdbc194e09cbd50
+SHA256:
+  metadata.gz: 487b201b39f11a9b727049130178a64b547d616a0365c1f957573a7ba391ccd6
+  data.tar.gz: 325f0ac86cbd9a0443ef96ba7c6a8d999297caa76c1c4a51ef13c7378fb757bf
 SHA512:
-  metadata.gz: d08f6fd7750f7ffa7b0f192cc1118df5cf7ac1ec2b6e268d8ae83235386ac7d0e196f57cc2b2319d89cd0685b8536e359c9d3991a91360b312a1f6822b12bd59
-  data.tar.gz: 9f199db5e997cc29f6223a1a63d524bf7458800aec4a0ea017035bfe87a37b08d2aba1a3abe33fd759a57bc8d071efb39e4dfbadb55d9276a74b5f786eac39c6
+  metadata.gz: 75bf8dcffca16b731fc974819a5104eaa5afd02be3ca972ab2916d4d80e11005118caf833333fcd10a4ca08f5af9640d42ac681b91073e50a3c9aaf2a12090ae
+  data.tar.gz: 2e29f746356ee76f365551b0b50faf17c46251684dddea1f478ac4c03cdc160f320b00270f384ba69b121e56a48833977687ec4594269efb387772374a609ac0

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/CHANGELOG.md

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

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,18 +1,24 @@
 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/bcrypt_pbkdf_ext.so",
-  "lib/bcrypt_pbkdf_ext.bundle",
+  "lib/2.4",
+  "lib/2.5",
+  "lib/2.6",
+  "lib/2.7",
+  "lib/3.0",
+  "lib/bcrypt_pbkdf_ext.so"
 )
 CLOBBER.include(
   "doc",
@@ -21,8 +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"
-  #: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")
@@ -31,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"
@@ -56,13 +68,4 @@ Rake::ExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
   ext.ext_dir = 'ext/mri'
   ext.cross_compile = true
   ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
-  puts "FAT_DIR:#{ENV["FAT_DIR"]}"
-  puts "RUBY_VERSION:#{RUBY_VERSION}"
-  #if RUBY_VERSION=="2.3.0"
-  #  ext.lib_dir = File.join('lib',"2.3")
-  #end
-    #else
-  #  ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-  #ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
-  #ext.cross_platform = ['i386-mingw32', 'x64-mingw32']
 end

data/bcrypt_pbkdf.gemspec

@@ -1,21 +1,20 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.0.0.alpha1'
+  s.version = '1.1.0.rc2'
 
-  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.0'
+  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']
@@ -25,6 +24,6 @@ Gem::Specification.new do |s|
 
   s.authors = ["Miklos Fazekas"]
   s.email = "mfazekas@szemafor.com"
-  s.homepage = "https://github.com/mfazekas/bcrypt_pbkdf-ruby"
+  s.homepage = "https://github.com/net-ssh/bcrypt_pbkdf-ruby"
   s.license = "MIT"
-end
+end

data/ext/mri/bcrypt_pbkdf_ext.c

@@ -7,15 +7,15 @@ static VALUE cBCryptPbkdfEngine;
 /* Given a secret and a salt a key and the number of rounds and returns the encrypted secret
 */
 static VALUE bc_crypt_pbkdf(VALUE self, VALUE pass, VALUE salt, VALUE keylen, VALUE rounds) {
-  size_t okeylen = NUM2UINT(keylen);
-  u_int8_t* okey = xmalloc(keylen);
+  size_t okeylen = NUM2ULONG(keylen);
+  u_int8_t* okey = xmalloc(okeylen);
   VALUE out;
 
   int ret = bcrypt_pbkdf(
     StringValuePtr(pass), RSTRING_LEN(pass),
     (const u_int8_t*)StringValuePtr(salt), RSTRING_LEN(salt),
     okey, okeylen,
-    NUM2UINT(rounds));
+    NUM2ULONG(rounds));
   if (ret < 0)
     return Qnil;
   out = rb_str_new((const char*)okey, okeylen);

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/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,23 +30,23 @@ 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
 
     amt = [amt, remlen].min
     (0...amt).each do |i|
-      dest = i * stride + (count - 1)
+      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.alpha1
+  version: 1.1.0.rc2
 platform: x86-mingw32
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 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.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
-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: []
@@ -109,7 +95,6 @@ files:
 - CHANGELOG.md
 - COPYING
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bcrypt_pbkdf.gemspec
@@ -126,14 +111,16 @@ files:
 - ext/mri/sha2.h
 - ext/mri/util.h
 - ext/mri/utils.h
-- lib/2.0/bcrypt_pbkdf_ext.so
-- lib/2.1/bcrypt_pbkdf_ext.so
 - lib/2.2/bcrypt_pbkdf_ext.so
 - lib/2.3/bcrypt_pbkdf_ext.so
+- lib/2.4/bcrypt_pbkdf_ext.so
+- lib/2.5/bcrypt_pbkdf_ext.so
+- lib/2.6/bcrypt_pbkdf_ext.so
+- lib/2.7/bcrypt_pbkdf_ext.so
 - lib/bcrypt_pbkdf.rb
 - test/bcrypt_pnkdf/engine_test.rb
 - test/test_helper.rb
-homepage: https://github.com/mfazekas/bcrypt_pbkdf-ruby
+homepage: https://github.com/net-ssh/bcrypt_pbkdf-ruby
 licenses:
 - MIT
 metadata: {}
@@ -151,16 +138,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 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.0.alpha1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.9.10)
-    json (1.8.3)
-    minitest (5.8.4)
-    rake (11.1.1)
-    rake-compiler (0.9.7)
-      rake
-    rake-compiler-dock (0.5.2)
-    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.0)
-  rbnacl (~> 3.3)
-  rbnacl-libsodium (~> 1.0.8)
-  rdoc (~> 3.12)
-
-BUNDLED WITH
-   1.11.2