bcrypt_pbkdf 1.1.2-x86-mingw32 → 1.2.0.beta1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313a21f5f1d5f4802bc551f6a56fb10857fcf0d4e158ad298f8ba80f0701ca2c
-  data.tar.gz: 79d24ad96046208c17435a4a1363d75c0b321c31fca90e570ace307eed61f9eb
+  metadata.gz: a7b555abee9e8aa847e4a3989e38a9e2cdfea6db49f92e1342ae7411bc43737c
+  data.tar.gz: 5ab435657574e742fb898c03e7e8a4fa552d73d6d998d57d72c2dfdd45a9544e
 SHA512:
-  metadata.gz: bd0b06cf79e6b29af0febddd6f881e1966befaf0c4e75767ce900af7bc1317a2c5db94305ccd4a0bde8f5ebc901dc9e141beff0506201f577fa914b6ae2e562b
-  data.tar.gz: 7edc64e7f41dde6a5e4c14488261aa5beb997c1ea5a7c0811507c194603d140561dc0a2f35a77ee0caa25b1ae3589ca35655c2a96e6fc2a58ae2a897c4ca2e83
+  metadata.gz: 43ea19f9b5836938c738bd44d4bd01a2cff96be03dc719a2ebba990e0a093fa1e4adc369f3ec83510a50ad743200720e994573387c71e61dcd21043369e45cd7
+  data.tar.gz: a9dffe7bb545038f7f1867e5ded5b070643a3ac06b0aa1f04066c7fe21ad07e003f200409b3e58f750a634ab32fe4aac29436c28ef70187427a0dc49f02adaf2

data/.github/workflows/ci.yml

@@ -46,3 +46,30 @@ jobs:
           bundler-cache: true
       - run: bundle exec rake compile
       - run: bundle exec rake test
+
+  jruby:
+    name: ubuntu-latest ruby jruby
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: jruby
+          bundler-cache: true
+      - run: bundle exec rake compile:java
+      - run: bundle exec rake test
+
+  memcheck:
+    name: Memory leak check (valgrind)
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: Gemfile.memcheck
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+      - run: sudo apt-get install -y valgrind
+      - run: bundle exec rake compile
+      - run: bundle exec rake memcheck

data/.gitignore

@@ -1,4 +1,5 @@
-lib/
+lib/*.jar
+lib/*.so
 pkg/
 tmp/
 Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,38 @@
-# 1.0.0.apha1
+# 1.2.0.beta1
 
-  initial version
+* JRuby support: native Java extension (`-java` gem variant) [#30]
+* Fix: missing salt size cap guard (`saltlen > 1<<20`) in Java implementation to match C behavior [#30]
+* Fix: memory leak on error state in C extension [#34]
+* Sync `bcrypt_pbkdf.c` (v1.13→v1.17) and `blowfish.c` (v1.19→v1.20) from OpenBSD [#36]
+* Sync `blf.h` to OpenBSD v1.8, drop advertising clause [#38]
+* Fix compatibility with minitest 6 [#28]
+
+# 1.1.2
+
+* Add Ruby 3.4 support [#26]
+
+# 1.1.1
+
+* Fix cross-compile and native gem publishing [#22]
+* Fix compile on Windows (missing bzero)
+* Replace Travis CI with GitHub Actions
+* Minitest 5.19 compatibility [#21]
+
+# 1.1.0
+
+* Ruby 3.0 support
+* Support rubies 2.0–2.7 in Windows cross-compile
+* Fix inline static function declarations [#15]
+* Add Linux on Power (ppc64) support [#11]
+* Use size_t for xmalloc [#7]
+* Fix gem summary typo [#9]
+
+# 1.0.1
+
+* Fix compile on Solarish platforms [#3]
+* Drop rbnacl test dependency, use native OpenSSL instead [#6]
+* Fix spelling in source [#2]
+
+# 1.0.0
+
+* Initial release

data/Gemfile.memcheck

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'ruby_memcheck'

data/README.md

@@ -9,10 +9,19 @@ bcrypt_pbkdf is a ruby gem implementing bcrypt_pbkdf from OpenBSD. This is curre
 * The gut of the code is based on OpenBSD's bcrypt_pbkdf.c implementation
 * Some ideas/code were taken adopted bcrypt-ruby: https://github.com/codahale/bcrypt-ruby
 
+## Upstream sources
+
+The C sources are synced from openssh-portable, which tracks OpenBSD CVS:
+
+| File | OpenBSD version |
+|------|----------------|
+| `ext/mri/bcrypt_pbkdf.c` | [v1.17](https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c?rev=1.17) |
+| `ext/mri/blowfish.c` | [v1.20](https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libcrypto/blowfish.c?rev=1.20) |
+| `ext/mri/blf.h` | [v1.8](https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libcrypto/blf.h?rev=1.8) |
+
 ## Links
 
 * 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
 

data/Rakefile

@@ -2,12 +2,26 @@ require 'rake/testtask'
 require 'rubygems/package_task'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
+begin
+  require 'rake/javaextensiontask'
+rescue LoadError
+end
 require 'rake/clean'
 require 'rdoc/task'
 require 'benchmark'
 require 'rake_compiler_dock'
 
+begin
+  require 'ruby_memcheck'
+  RubyMemcheck::TestTask.new(memcheck: :compile) do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/*_test.rb']
+  end
+rescue LoadError
+end
+
 CLEAN.add("{ext,lib}/**/*.{o,so}", "pkg")
+CLEAN.add("{ext,lib}/**/*.{jar,class}")
 
 cross_rubies = ["3.4.0", "3.3.0", "3.2.0", "3.1.0", "3.0.0", "2.7.0"]
 cross_platforms = [
@@ -41,11 +55,23 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include(*GEMSPEC.extra_rdoc_files)
 end
 
-Rake::ExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
-  ext.ext_dir = 'ext/mri'
-  ext.cross_compile = true
-  ext.cross_platform = cross_platforms
-  ext.cross_config_options << "--enable-cross-build" # so extconf.rb knows we're cross-compiling
+unless RUBY_PLATFORM == 'java'
+  Rake::ExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/mri'
+    ext.cross_compile = true
+    ext.cross_platform = cross_platforms
+    ext.cross_config_options << "--enable-cross-build" # so extconf.rb knows we're cross-compiling
+  end
+end
+
+if defined?(Rake::JavaExtensionTask)
+  Rake::JavaExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/jruby'
+    ext.source_pattern = '**/*.java'
+    ext.source_version = '8'
+    ext.target_version = '8'
+    ext.lint_option = '-options'
+  end
 end
 
 namespace "gem" do
@@ -73,11 +99,24 @@ namespace "gem" do
     end
   end
 
+  desc "build java gem for JRuby"
+  task "java" do
+    Rake::Task["java:#{GEMSPEC.name}"].invoke
+    Rake::Task["pkg/#{GEMSPEC.full_name}-java.gem"].invoke
+  end
+
+  namespace "java" do
+    task "release" do
+      sh "gem push pkg/#{GEMSPEC.full_name}-java.gem"
+    end
+  end
+
   desc "build native gem for all platforms"
   task "all" do
     cross_platforms.each do |platform|
       Rake::Task["gem:#{platform}"].invoke
     end
+    Rake::Task["gem:java"].invoke if defined?(Rake::JavaExtensionTask) && ENV['JRUBY_HOME']
   end
 
   desc "release native gem for all platforms"
@@ -85,6 +124,7 @@ namespace "gem" do
     cross_platforms.each do |platform|
       Rake::Task["gem:#{platform}:release"].invoke
     end
+    Rake::Task["gem:java:release"].invoke if File.exist?("pkg/#{GEMSPEC.full_name}-java.gem")
   end
 end
 

data/bcrypt_pbkdf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt_pbkdf'
-  s.version = '1.1.2'
+  s.version = '1.2.0.beta1'
 
   s.summary = "OpenBSD's bcrypt_pbkdf (a variant of PBKDF2 with bcrypt-based PRF)"
   s.description = <<-EOF

data/ext/jruby/org/netssh/bcrypt_pbkdf/BCryptPbkdf.java

@@ -0,0 +1,402 @@
+package org.netssh.bcrypt_pbkdf;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+public final class BCryptPbkdf {
+  private static final int BLF_N = 16;
+  private static final int BCRYPT_WORDS = 8;
+  private static final int BCRYPT_HASHSIZE = BCRYPT_WORDS * 4;
+  private static final int SHA512_DIGEST_LENGTH = 64;
+  private static final int[] INITSTATE = new int[] {
+    0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96,
+    0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+    0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658,
+    0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+    0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
+    0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+    0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6,
+    0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+    0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c,
+    0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+    0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
+    0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+    0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a,
+    0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+    0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
+    0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+    0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706,
+    0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+    0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b,
+    0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+    0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c,
+    0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+    0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a,
+    0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+    0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
+    0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+    0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
+    0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+    0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33,
+    0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+    0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0,
+    0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+    0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
+    0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+    0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
+    0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+    0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e,
+    0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+    0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9,
+    0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+    0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f,
+    0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+    0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, 0x4b7a70e9, 0xb5b32944,
+    0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+    0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29,
+    0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+    0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26,
+    0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+    0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c,
+    0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+    0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6,
+    0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+    0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f,
+    0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+    0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810,
+    0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+    0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa,
+    0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+    0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55,
+    0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+    0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1,
+    0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+    0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, 0xc6150eba, 0x94e2ea78,
+    0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+    0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, 0xa67bc883,
+    0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+    0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, 0x1521b628, 0x29076170,
+    0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+    0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7,
+    0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+    0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099,
+    0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+    0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263,
+    0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+    0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3,
+    0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+    0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7,
+    0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+    0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d,
+    0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+    0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460,
+    0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+    0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484,
+    0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+    0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a,
+    0xe6e39f2b, 0xdb83adf7, 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+    0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a,
+    0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+    0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785,
+    0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+    0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900,
+    0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+    0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9,
+    0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+    0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397,
+    0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+    0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9,
+    0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+    0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f,
+    0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+    0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e,
+    0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+    0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd,
+    0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+    0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8,
+    0x991be14c, 0xdb6e6b0d, 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+    0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c,
+    0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+    0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b,
+    0x12754ccc, 0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+    0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386,
+    0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+    0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0,
+    0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+    0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2,
+    0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+    0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770,
+    0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+    0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c,
+    0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+    0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa,
+    0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+    0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63,
+    0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+    0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9,
+    0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+    0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4,
+    0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+    0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742,
+    0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+    0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79,
+    0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+    0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
+    0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+    0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
+    0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+    0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797,
+    0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+    0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
+    0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+    0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba,
+    0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+    0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5,
+    0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+    0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
+    0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+    0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd,
+    0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+    0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb,
+    0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+    0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc,
+    0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+    0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc,
+    0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+    0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
+    0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+    0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a,
+    0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+    0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b,
+    0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+    0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
+    0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+    0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623,
+    0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+    0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
+    0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+    0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3,
+    0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+    0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c,
+    0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+    0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, 0x243f6a88, 0x85a308d3,
+    0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+    0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd,
+    0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
+  };
+
+  static byte[] cryptPbkdf(byte[] pass, byte[] salt, int keylen, int rounds) {
+    if (rounds < 1 || pass.length == 0 || salt.length == 0 || keylen == 0 || keylen > BCRYPT_HASHSIZE * BCRYPT_HASHSIZE || salt.length > (1 << 20)) {
+      return null;
+    }
+
+    byte[] key = new byte[keylen];
+    byte[] sha2pass = sha512(pass);
+    byte[] sha2salt;
+    byte[] out = new byte[BCRYPT_HASHSIZE];
+    byte[] tmpout;
+    byte[] countsalt = new byte[salt.length + 4];
+    System.arraycopy(salt, 0, countsalt, 0, salt.length);
+
+    int stride = (keylen + BCRYPT_HASHSIZE - 1) / BCRYPT_HASHSIZE;
+    int amt = (keylen + stride - 1) / stride;
+    int origkeylen = keylen;
+
+    for (int count = 1; keylen > 0; count++) {
+      countsalt[salt.length] = (byte) ((count >>> 24) & 0xff);
+      countsalt[salt.length + 1] = (byte) ((count >>> 16) & 0xff);
+      countsalt[salt.length + 2] = (byte) ((count >>> 8) & 0xff);
+      countsalt[salt.length + 3] = (byte) (count & 0xff);
+
+      sha2salt = sha512(countsalt);
+      tmpout = bcryptHash(sha2pass, sha2salt);
+      System.arraycopy(tmpout, 0, out, 0, out.length);
+
+      for (int i = 1; i < rounds; i++) {
+        sha2salt = sha512(tmpout);
+        tmpout = bcryptHash(sha2pass, sha2salt);
+        for (int j = 0; j < out.length; j++) {
+          out[j] ^= tmpout[j];
+        }
+      }
+
+      amt = Math.min(amt, keylen);
+      int i;
+      for (i = 0; i < amt; i++) {
+        int dest = i * stride + (count - 1);
+        if (dest >= origkeylen) {
+          break;
+        }
+        key[dest] = out[i];
+      }
+      keylen -= i;
+    }
+
+    Arrays.fill(sha2pass, (byte) 0);
+    Arrays.fill(out, (byte) 0);
+    return key;
+  }
+
+  static byte[] cryptHash(byte[] sha2pass, byte[] sha2salt) {
+    if (sha2pass.length != SHA512_DIGEST_LENGTH || sha2salt.length != SHA512_DIGEST_LENGTH) {
+      return null;
+    }
+    return bcryptHash(sha2pass, sha2salt);
+  }
+
+  private static byte[] bcryptHash(byte[] sha2pass, byte[] sha2salt) {
+    BlowfishContext state = new BlowfishContext();
+    byte[] ciphertext = "OxychromaticBlowfishSwatDynamite".getBytes(StandardCharsets.US_ASCII);
+    int[] cdata = new int[BCRYPT_WORDS];
+    byte[] out = new byte[BCRYPT_HASHSIZE];
+    int[] current = new int[] { 0 };
+
+    Blowfish_initstate(state);
+    Blowfish_expandstate(state, sha2salt, SHA512_DIGEST_LENGTH, sha2pass, SHA512_DIGEST_LENGTH);
+    for (int i = 0; i < 64; i++) {
+      Blowfish_expand0state(state, sha2salt, SHA512_DIGEST_LENGTH);
+      Blowfish_expand0state(state, sha2pass, SHA512_DIGEST_LENGTH);
+    }
+
+    for (int i = 0; i < BCRYPT_WORDS; i++) {
+      cdata[i] = Blowfish_stream2word(ciphertext, ciphertext.length, current);
+    }
+    for (int i = 0; i < 64; i++) {
+      blf_enc(state, cdata, cdata.length / 2);
+    }
+
+    for (int i = 0; i < BCRYPT_WORDS; i++) {
+      out[4 * i + 3] = (byte) ((cdata[i] >>> 24) & 0xff);
+      out[4 * i + 2] = (byte) ((cdata[i] >>> 16) & 0xff);
+      out[4 * i + 1] = (byte) ((cdata[i] >>> 8) & 0xff);
+      out[4 * i] = (byte) (cdata[i] & 0xff);
+    }
+
+    Arrays.fill(ciphertext, (byte) 0);
+    Arrays.fill(cdata, 0);
+    state.clear();
+    return out;
+  }
+
+  private static byte[] sha512(byte[] data) {
+    try {
+      return MessageDigest.getInstance("SHA-512").digest(data);
+    } catch (NoSuchAlgorithmException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  private static int F(int[][] s, int x) {
+    return ((s[0][(x >>> 24) & 0xff] + s[1][(x >>> 16) & 0xff]) ^ s[2][(x >>> 8) & 0xff]) + s[3][x & 0xff];
+  }
+
+  private static void Blowfish_encipher(BlowfishContext c, int[] data, int offset) {
+    int xl = data[offset];
+    int xr = data[offset + 1];
+    int[] p = c.P;
+
+    xl ^= p[0];
+    xr ^= F(c.S, xl) ^ p[1]; xl ^= F(c.S, xr) ^ p[2];
+    xr ^= F(c.S, xl) ^ p[3]; xl ^= F(c.S, xr) ^ p[4];
+    xr ^= F(c.S, xl) ^ p[5]; xl ^= F(c.S, xr) ^ p[6];
+    xr ^= F(c.S, xl) ^ p[7]; xl ^= F(c.S, xr) ^ p[8];
+    xr ^= F(c.S, xl) ^ p[9]; xl ^= F(c.S, xr) ^ p[10];
+    xr ^= F(c.S, xl) ^ p[11]; xl ^= F(c.S, xr) ^ p[12];
+    xr ^= F(c.S, xl) ^ p[13]; xl ^= F(c.S, xr) ^ p[14];
+    xr ^= F(c.S, xl) ^ p[15]; xl ^= F(c.S, xr) ^ p[16];
+
+    data[offset] = xr ^ p[17];
+    data[offset + 1] = xl;
+  }
+
+  private static void Blowfish_initstate(BlowfishContext c) {
+    int n = 0;
+    for (int i = 0; i < 4; i++) {
+      System.arraycopy(INITSTATE, n, c.S[i], 0, 256);
+      n += 256;
+    }
+    System.arraycopy(INITSTATE, n, c.P, 0, BLF_N + 2);
+  }
+
+  private static int Blowfish_stream2word(byte[] data, int databytes, int[] current) {
+    int temp = 0;
+    int j = current[0];
+    for (int i = 0; i < 4; i++, j++) {
+      if (j >= databytes) {
+        j = 0;
+      }
+      temp = (temp << 8) | (data[j] & 0xff);
+    }
+    current[0] = j;
+    return temp;
+  }
+
+  private static void Blowfish_expand0state(BlowfishContext c, byte[] key, int keybytes) {
+    int[] current = new int[] { 0 };
+    for (int i = 0; i < BLF_N + 2; i++) {
+      c.P[i] ^= Blowfish_stream2word(key, keybytes, current);
+    }
+
+    int[] data = new int[] { 0, 0 };
+    for (int i = 0; i < BLF_N + 2; i += 2) {
+      Blowfish_encipher(c, data, 0);
+      c.P[i] = data[0];
+      c.P[i + 1] = data[1];
+    }
+
+    for (int i = 0; i < 4; i++) {
+      for (int k = 0; k < 256; k += 2) {
+        Blowfish_encipher(c, data, 0);
+        c.S[i][k] = data[0];
+        c.S[i][k + 1] = data[1];
+      }
+    }
+  }
+
+  private static void Blowfish_expandstate(BlowfishContext c, byte[] dataBytes, int databytes, byte[] key, int keybytes) {
+    int[] current = new int[] { 0 };
+    for (int i = 0; i < BLF_N + 2; i++) {
+      c.P[i] ^= Blowfish_stream2word(key, keybytes, current);
+    }
+
+    current[0] = 0;
+    int[] data = new int[] { 0, 0 };
+    for (int i = 0; i < BLF_N + 2; i += 2) {
+      data[0] ^= Blowfish_stream2word(dataBytes, databytes, current);
+      data[1] ^= Blowfish_stream2word(dataBytes, databytes, current);
+      Blowfish_encipher(c, data, 0);
+      c.P[i] = data[0];
+      c.P[i + 1] = data[1];
+    }
+
+    for (int i = 0; i < 4; i++) {
+      for (int k = 0; k < 256; k += 2) {
+        data[0] ^= Blowfish_stream2word(dataBytes, databytes, current);
+        data[1] ^= Blowfish_stream2word(dataBytes, databytes, current);
+        Blowfish_encipher(c, data, 0);
+        c.S[i][k] = data[0];
+        c.S[i][k + 1] = data[1];
+      }
+    }
+  }
+
+  private static void blf_enc(BlowfishContext c, int[] data, int blocks) {
+    for (int i = 0, offset = 0; i < blocks; i++, offset += 2) {
+      Blowfish_encipher(c, data, offset);
+    }
+  }
+
+  private static class BlowfishContext {
+    final int[][] S = new int[4][256];
+    final int[] P = new int[BLF_N + 2];
+
+    void clear() {
+      for (int[] s : S) {
+        Arrays.fill(s, 0);
+      }
+      Arrays.fill(P, 0);
+    }
+  }
+}

data/ext/jruby/org/netssh/bcrypt_pbkdf/BCryptPbkdfExt.java

@@ -0,0 +1,47 @@
+package org.netssh.bcrypt_pbkdf;
+
+import org.jcodings.specific.ASCIIEncoding;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public final class BCryptPbkdfExt {
+
+  public static void load(final Ruby runtime) {
+    RubyModule bcryptPbkdf = runtime.getOrCreateModule("BCryptPbkdf");
+    RubyClass engine = bcryptPbkdf.defineOrGetClassUnder("Engine", runtime.getObject());
+    engine.getSingletonClass().defineAnnotatedMethods(BCryptPbkdfExt.class);
+  }
+
+  @JRubyMethod(required = 4, rest = true)
+  public static IRubyObject __bc_crypt_pbkdf(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+    byte[] key = BCryptPbkdf.cryptPbkdf(
+            stringToBytes(args[0]),
+            stringToBytes(args[1]),
+            RubyNumeric.num2int(args[2]),
+            RubyNumeric.num2int(args[3]));
+    if (key == null) return context.nil;
+    return newString(context.runtime, key);
+  }
+
+
+  @JRubyMethod(required = 2, rest = true)
+  public static IRubyObject __bc_crypt_hash(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+    byte[] out = BCryptPbkdf.cryptHash(stringToBytes(args[0]), stringToBytes(args[1]));
+    if (out == null) return context.nil;
+    return newString(context.runtime, out);
+  }
+
+  private static byte[] stringToBytes(final IRubyObject value) {
+    return value.convertToString().getBytes();
+  }
+
+  private static RubyString newString(final Ruby runtime, final byte[] bytes) {
+    return RubyString.newString(runtime, bytes, 0, bytes.length, ASCIIEncoding.INSTANCE);
+  }
+}

data/ext/mri/bcrypt_pbkdf.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt_pbkdf.c,v 1.13 2015/01/12 03:20:04 tedu Exp $ */
+/* $OpenBSD: bcrypt_pbkdf.c,v 1.17 2022/12/27 17:10:08 jmc Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -15,14 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
+#include "includes.h"
+#include "crypto_api.h"
 
-#include <stdint.h>
-#include <stdlib.h>
-#include "blf.h"
-#include "sha2.h"
-#include <string.h>
-#include "util.h"
+#ifdef SHA512_DIGEST_LENGTH
+# undef SHA512_DIGEST_LENGTH
+#endif
+#define SHA512_DIGEST_LENGTH crypto_hash_sha512_BYTES
 
 #define	MINIMUM(a,b) (((a) < (b)) ? (a) : (b))
 
@@ -33,7 +32,7 @@
  * function with the following modifications:
  * 1. The input password and salt are preprocessed with SHA512.
  * 2. The output length is expanded to 256 bits.
- * 3. Subsequently the magic string to be encrypted is lengthened and modifed
+ * 3. Subsequently the magic string to be encrypted is lengthened and modified
  *    to "OxychromaticBlowfishSwatDynamite"
  * 4. The hash function is defined to perform 64 rounds of initial state
  *    expansion. (More rounds are performed by iterating the hash.)
@@ -50,14 +49,15 @@
  * wise caller could do; we just do it for you.
  */
 
-#define BCRYPT_WORDS 8
-#define BCRYPT_HASHSIZE (BCRYPT_WORDS * 4)
-
 void
-bcrypt_hash(const uint8_t *sha2pass, const uint8_t *sha2salt, uint8_t *out)
+bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out)
 {
 	blf_ctx state;
+#if defined(__has_attribute) && __has_attribute(__nonstring__)
+	uint8_t __attribute__ ((__nonstring__)) ciphertext[BCRYPT_HASHSIZE] =
+#else
 	uint8_t ciphertext[BCRYPT_HASHSIZE] =
+#endif
 	    "OxychromaticBlowfishSwatDynamite";
 	uint32_t cdata[BCRYPT_WORDS];
 	int i;
@@ -78,7 +78,7 @@ bcrypt_hash(const uint8_t *sha2pass, const uint8_t *sha2salt, uint8_t *out)
 		cdata[i] = Blowfish_stream2word(ciphertext, sizeof(ciphertext),
 		    &j);
 	for (i = 0; i < 64; i++)
-		blf_enc(&state, cdata, sizeof(cdata) / sizeof(uint64_t));
+		blf_enc(&state, cdata, BCRYPT_WORDS / 2);
 
 	/* copy out */
 	for (i = 0; i < BCRYPT_WORDS; i++) {
@@ -98,12 +98,11 @@ int
 bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltlen,
     uint8_t *key, size_t keylen, unsigned int rounds)
 {
-	SHA2_CTX ctx;
 	uint8_t sha2pass[SHA512_DIGEST_LENGTH];
 	uint8_t sha2salt[SHA512_DIGEST_LENGTH];
 	uint8_t out[BCRYPT_HASHSIZE];
 	uint8_t tmpout[BCRYPT_HASHSIZE];
-	uint8_t countsalt[4];
+	uint8_t *countsalt;
 	size_t i, j, amt, stride;
 	uint32_t count;
 	size_t origkeylen = keylen;
@@ -112,37 +111,34 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltl
 	if (rounds < 1)
 		return -1;
 	if (passlen == 0 || saltlen == 0 || keylen == 0 ||
-	    keylen > sizeof(out) * sizeof(out))
+	    keylen > sizeof(out) * sizeof(out) || saltlen > 1<<20)
+		return -1;
+	if ((countsalt = calloc(1, saltlen + 4)) == NULL)
 		return -1;
 	stride = (keylen + sizeof(out) - 1) / sizeof(out);
 	amt = (keylen + stride - 1) / stride;
 
-	/* collapse password */
-	SHA512Init(&ctx);
-	SHA512Update(&ctx, pass, passlen);
-	SHA512Final(sha2pass, &ctx);
+	memcpy(countsalt, salt, saltlen);
 
+	/* collapse password */
+	crypto_hash_sha512(sha2pass, (const uint8_t *)pass, passlen);
 
 	/* generate key, sizeof(out) at a time */
 	for (count = 1; keylen > 0; count++) {
-		countsalt[0] = (count >> 24) & 0xff;
-		countsalt[1] = (count >> 16) & 0xff;
-		countsalt[2] = (count >> 8) & 0xff;
-		countsalt[3] = count & 0xff;
+		countsalt[saltlen + 0] = (count >> 24) & 0xff;
+		countsalt[saltlen + 1] = (count >> 16) & 0xff;
+		countsalt[saltlen + 2] = (count >> 8) & 0xff;
+		countsalt[saltlen + 3] = count & 0xff;
 
 		/* first round, salt is salt */
-		SHA512Init(&ctx);
-		SHA512Update(&ctx, salt, saltlen);
-		SHA512Update(&ctx, countsalt, sizeof(countsalt));
-		SHA512Final(sha2salt, &ctx);
+		crypto_hash_sha512(sha2salt, countsalt, saltlen + 4);
+
 		bcrypt_hash(sha2pass, sha2salt, tmpout);
 		memcpy(out, tmpout, sizeof(out));
 
 		for (i = 1; i < rounds; i++) {
 			/* subsequent rounds, salt is previous output */
-			SHA512Init(&ctx);
-			SHA512Update(&ctx, tmpout, sizeof(tmpout));
-			SHA512Final(sha2salt, &ctx);
+			crypto_hash_sha512(sha2salt, tmpout, sizeof(tmpout));
 			bcrypt_hash(sha2pass, sha2salt, tmpout);
 			for (j = 0; j < sizeof(out); j++)
 				out[j] ^= tmpout[j];
@@ -162,8 +158,10 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltl
 	}
 
 	/* zap */
-	explicit_bzero(&ctx, sizeof(ctx));
+	explicit_bzero(countsalt, saltlen + 4);
+	free(countsalt);
 	explicit_bzero(out, sizeof(out));
+	explicit_bzero(tmpout, sizeof(tmpout));
 
 	return 0;
-}
+}

data/ext/mri/bcrypt_pbkdf_ext.c

@@ -8,6 +8,8 @@ static VALUE cBCryptPbkdfEngine;
 */
 static VALUE bc_crypt_pbkdf(VALUE self, VALUE pass, VALUE salt, VALUE keylen, VALUE rounds) {
   size_t okeylen = NUM2ULONG(keylen);
+  if (okeylen == 0 || okeylen > 1024)
+    return Qnil;
   u_int8_t* okey = xmalloc(okeylen);
   VALUE out;
 
@@ -16,8 +18,10 @@ static VALUE bc_crypt_pbkdf(VALUE self, VALUE pass, VALUE salt, VALUE keylen, VA
     (const u_int8_t*)StringValuePtr(salt), RSTRING_LEN(salt),
     okey, okeylen,
     NUM2ULONG(rounds));
-  if (ret < 0)
+  if (ret < 0) {
+    xfree(okey);
     return Qnil;
+  }
   out = rb_str_new((const char*)okey, okeylen);
   xfree(okey);
   return out;
@@ -29,7 +33,7 @@ static VALUE bc_crypt_hash(VALUE self, VALUE pass, VALUE salt) {
     return Qnil;
   if (RSTRING_LEN(salt) != 64U)
     return Qnil;
-  bcrypt_hash((const u_int8_t*)StringValuePtr(pass), (const u_int8_t*)StringValuePtr(salt), hash);
+  bcrypt_hash((u_int8_t*)StringValuePtr(pass), (u_int8_t*)StringValuePtr(salt), hash);
   return rb_str_new((const char*)hash, sizeof(hash));
 }
 

data/ext/mri/blf.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.7 2007/03/14 17:59:41 grunk Exp $ */
+/* $OpenBSD: blf.h,v 1.8 2021/11/29 01:04:45 djm Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
  *
@@ -13,10 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

data/ext/mri/blowfish.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: blowfish.c,v 1.19 2015/09/11 09:18:27 guenther Exp $ */
+/* $OpenBSD: blowfish.c,v 1.20 2021/11/29 01:04:45 djm Exp $ */
 /*
  * Blowfish block cipher for OpenBSD
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -14,10 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

data/ext/mri/includes.h

@@ -19,7 +19,7 @@ typedef uint32_t u_int32_t;
 void explicit_bzero(void *p, size_t n);
 int bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltlen,
     uint8_t *key, size_t keylen, unsigned int rounds);
-void bcrypt_hash(const uint8_t *sha2pass, const uint8_t *sha2salt, uint8_t *out);
+void bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out);
 
 #define BCRYPT_WORDS 8
 #define BCRYPT_HASHSIZE (BCRYPT_WORDS * 4)

data/lib/bcrypt_pbkdf.rb

@@ -1,8 +1,13 @@
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/bcrypt_pbkdf_ext"
-rescue LoadError
-  require "bcrypt_pbkdf_ext"
+if RUBY_PLATFORM == 'java'
+  load File.expand_path('bcrypt_pbkdf_ext.jar', __dir__)
+  JRuby::Util.load_ext('org.netssh.bcrypt_pbkdf.BCryptPbkdfExt')
+else
+  begin
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "#{$1}/bcrypt_pbkdf_ext"
+  rescue LoadError
+    require "bcrypt_pbkdf_ext"
+  end
 end
 
 module BCryptPbkdf
@@ -21,4 +26,3 @@ module BCryptPbkdf
     BCryptPbkdf::Engine::__bc_crypt_pbkdf(pass,salt,keylen,rounds)
   end
 end
-

data/test/bcrypt_pnkdf/engine_test.rb

@@ -1,5 +1,4 @@
 require 'minitest/autorun'
-require 'minitest/unit'
 require 'test_helper'
 
 # bcrypt_pbkdf in ruby
@@ -55,7 +54,7 @@ def bcrypt_pbkdf(password, salt, keylen, rounds)
 end
 
 
-class TestExt < Minitest::Unit::TestCase
+class TestExt < Minitest::Test
   def test_table
     assert_equal table, table.map{ |p,s,l,r| [p,s,l,r,BCryptPbkdf::Engine::__bc_crypt_pbkdf(p,s,l,r).bytes] }
   end
@@ -66,12 +65,51 @@ class TestExt < Minitest::Unit::TestCase
     end
   end
 
+  def test_invalid_pbkdf_arguments_return_nil
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('', 'salt', 14, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', '', 14, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 0, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 14, 0)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 1025, 1)
+  end
+
+  def test_hash_argument_lengths
+    sha2pass = OpenSSL::Digest.digest('SHA512', 'pass')
+    sha2salt = OpenSSL::Digest.digest('SHA512', 'salt')
+
+    assert_equal BCRYPT_HASHSIZE, BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass, sha2salt).bytesize
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass.byteslice(0, 63), sha2salt)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass, sha2salt.byteslice(0, 63))
+  end
+
+  # Issue #31/33: xmalloc(okeylen) was called before the guards inside
+  # bcrypt_pbkdf(), so out-of-range keylen caused a heap allocation that was
+  # never freed when bcrypt_pbkdf() returned -1. `loop { key("p","s",2000,1) }`
+  # on unfixed code would exhaust memory.
+  def test_invalid_keylen_returns_nil
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf("pass", "salt", 0, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf("pass", "salt", 1025, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf("pass", "salt", 2000, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf("pass", "salt", 32, 0)
+  end
+
+  def test_invalid_keylen_does_not_leak_memory
+    1000.times { BCryptPbkdf::Engine.__bc_crypt_pbkdf("pass", "salt", 2000, 1) }
+  end
 
   def table
     [
       ["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]]
+      ["doozoasd", "fooo$AS!", 14, 22, [57, 62, 50, 107, 70, 155, 65, 5, 129, 211, 189, 169, 188, 65]],
+      # vectors from jBCrypt (https://github.com/kruton/jbcrypt) by Kenny Root
+      ["password", "salt", 32, 4,  [0x5b, 0xbf, 0x0c, 0xc2, 0x93, 0x58, 0x7f, 0x1c, 0x36, 0x35, 0x55, 0x5c, 0x27, 0x79, 0x65, 0x98,
+                                    0xd4, 0x7e, 0x57, 0x90, 0x71, 0xbf, 0x42, 0x7e, 0x9d, 0x8f, 0xbe, 0x84, 0x2a, 0xba, 0x34, 0xd9]],
+      ["password", "salt", 64, 8,  [0xe1, 0x36, 0x7e, 0xc5, 0x15, 0x1a, 0x33, 0xfa, 0xac, 0x4c, 0xc1, 0xc1, 0x44, 0xcd, 0x23, 0xfa,
+                                    0x15, 0xd5, 0x54, 0x84, 0x93, 0xec, 0xc9, 0x9b, 0x9b, 0x5d, 0x9c, 0x0d, 0x3b, 0x27, 0xbe, 0xc7,
+                                    0x62, 0x27, 0xea, 0x66, 0x08, 0x8b, 0x84, 0x9b, 0x20, 0xab, 0x7a, 0xa4, 0x78, 0x01, 0x02, 0x46,
+                                    0xe7, 0x4b, 0xba, 0x51, 0x72, 0x3f, 0xef, 0xa9, 0xf9, 0x47, 0x4d, 0x65, 0x08, 0x84, 0x5e, 0x8d]],
+      ["password", "salt", 16, 42, [0x83, 0x3c, 0xf0, 0xdc, 0xf5, 0x6d, 0xb6, 0x56, 0x08, 0xe8, 0xf0, 0xdc, 0x0c, 0xe8, 0x82, 0xbd]],
     ]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt_pbkdf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0.beta1
 platform: x86-mingw32
 authors:
 - Miklos Fazekas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-05 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -110,9 +110,12 @@ files:
 - CHANGELOG.md
 - COPYING
 - Gemfile
+- Gemfile.memcheck
 - README.md
 - Rakefile
 - bcrypt_pbkdf.gemspec
+- ext/jruby/org/netssh/bcrypt_pbkdf/BCryptPbkdf.java
+- ext/jruby/org/netssh/bcrypt_pbkdf/BCryptPbkdfExt.java
 - ext/mri/bcrypt_pbkdf.c
 - ext/mri/bcrypt_pbkdf_ext.c
 - ext/mri/blf.h
@@ -158,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.4.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: