summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-12-01 19:49:42 -0600
committerSamuel Giddins <segiddins@segiddins.me>2016-12-01 19:49:42 -0600
commit8075f8cb2563df65e280bca482a21c3b20ce351b (patch)
treeeb03313a6633dcd835a2ab492bb889c46abede39
parent032203d8f005243be5dd5bfd99abd485b68b567f (diff)
downloadbundler-seg-fips.tar.gz
[CompactIndex] Only check for fips constant when it is definedseg-fips
-rw-r--r--lib/bundler/fetcher/compact_index.rb2
-rw-r--r--spec/bundler/fetcher/compact_index_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/fetcher/compact_index.rb b/lib/bundler/fetcher/compact_index.rb
index 5cd8a3e8f1..dcc9d57c13 100644
--- a/lib/bundler/fetcher/compact_index.rb
+++ b/lib/bundler/fetcher/compact_index.rb
@@ -124,7 +124,7 @@ module Bundler
def md5_available?
begin
require "openssl"
- return false if OpenSSL::OPENSSL_FIPS
+ return false if defined?(OpenSSL::OPENSSL_FIPS) && OpenSSL::OPENSSL_FIPS
rescue LoadError
nil
end
diff --git a/spec/bundler/fetcher/compact_index_spec.rb b/spec/bundler/fetcher/compact_index_spec.rb
index 503810723c..691e19f638 100644
--- a/spec/bundler/fetcher/compact_index_spec.rb
+++ b/spec/bundler/fetcher/compact_index_spec.rb
@@ -26,7 +26,7 @@ describe Bundler::Fetcher::CompactIndex do
end
describe "#available?" do
- context "when OpenSSL is in FIPS mode" do
+ context "when OpenSSL is in FIPS mode", :ruby => ">= 2.0.0" do
before { stub_const("OpenSSL::OPENSSL_FIPS", true) }
it "returns false" do