From e6c025811b984b1a1c2a4bca799a183c7f623564 Mon Sep 17 00:00:00 2001 From: Jeffrey Martin Date: Tue, 30 Jul 2019 16:47:26 -0500 Subject: [PATCH] Lock bcrypt gem until armhf support is restored. Updates in 3.1.13 can cause native gem compile to fail due to https://github.com/codahale/bcrypt-ruby/issues/201. --- Gemfile.lock | 4 ++-- metasploit-framework.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 54e363093f..6dd83c5231 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ PATH aws-sdk-iam aws-sdk-s3 backports - bcrypt + bcrypt (= 3.1.12) bcrypt_pbkdf bit-struct concurrent-ruby (= 1.0.5) @@ -137,7 +137,7 @@ GEM aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) backports (3.15.0) - bcrypt (3.1.13) + bcrypt (3.1.12) bcrypt_pbkdf (1.0.1) bindata (2.4.4) bit-struct (0.16) diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index 663ba325ed..86853958cd 100644 --- a/metasploit-framework.gemspec +++ b/metasploit-framework.gemspec @@ -53,7 +53,7 @@ Gem::Specification.new do |spec| # Backports Ruby features across language versions spec.add_runtime_dependency 'backports' # Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb) - spec.add_runtime_dependency 'bcrypt' + spec.add_runtime_dependency 'bcrypt', '3.1.12' # Needed for Javascript obfuscation spec.add_runtime_dependency 'jsobfu' # Needed for some admin modules (scrutinizer_add_user.rb)