bcrypt_pbkdf 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f48bfa6cb34ed011d86077b7db9e705bb767866
-  data.tar.gz: 190a384d0683bfe2c8e6de946e25ae237ea70176
+SHA256:
+  metadata.gz: 63ac8948f4ecd73d2450a88ffe9c4cba42c00046ac292841be016965eb5834e4
+  data.tar.gz: 34bf1a1d2025f60d29db8dacb052df7264262cd22f5d0b480d0fdafe01fe8f8c
 SHA512:
-  metadata.gz: 011cafb3a4e5071473d07c7313ccbc01701f0ab2c50318aa2c585eefe14681379b1bbaf31f8675c3e1e8728c86402305975f467920df33cb97561a4726aae1e5
-  data.tar.gz: 881231d96178f84dcec1e2961268ec1cc38c4ce54764d0a3b1317c55d8ddebb0039e20a9258d1f59154aaf9cbceaaae67883334e902dfb3b492a7cc2b158818f
+  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)
 
@@ -19,7 +19,7 @@ http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c?rev=1.13
 For windows cross build make sure you checked out the gem source under the home directory
 
 ```sh
-gem install rake-compiler-docks
+gem install rake-compiler-dock
 ```
 
 ```sh
@@ -28,4 +28,5 @@ 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

@@ -6,10 +6,18 @@ 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(
@@ -19,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")

data/bcrypt_pbkdf.gemspec

@@ -1,20 +1,20 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.0.1'
+  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 '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); }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt_pbkdf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-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
@@ -72,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: []
@@ -96,7 +96,6 @@ files:
 - CHANGELOG.md
 - COPYING
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bcrypt_pbkdf.gemspec
@@ -141,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+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,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bcrypt_pbkdf (1.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    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)
-    rdoc (3.12.2)
-      json (~> 1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bcrypt_pbkdf!
-  minitest (>= 5)
-  openssl
-  rake-compiler (~> 0.9.7)
-  rake-compiler-dock (~> 0.5.3)
-  rdoc (~> 3.12)
-
-BUNDLED WITH
-   1.17.3