diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-09-23 14:06:00 -0700 |
---|---|---|
committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2015-12-17 17:42:21 -0500 |
commit | 597bf18559cc9236edf989ddb052037d951004a6 (patch) | |
tree | f74cfc52f0882763c67f91817b4059d80f2dd20c | |
parent | ec0297d741a08116b10ec425a83248acdb7cb102 (diff) | |
download | chef-597bf18559cc9236edf989ddb052037d951004a6.tar.gz |
Allow all platforms to get openssl patch
-rw-r--r-- | config/software/openssl-customization.rb | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/config/software/openssl-customization.rb b/config/software/openssl-customization.rb index f0ef483886..4310ebd151 100644 --- a/config/software/openssl-customization.rb +++ b/config/software/openssl-customization.rb @@ -30,24 +30,24 @@ else end build do - if windows? - block "Add OpenSSL customization file" do - # gets directories for RbConfig::CONFIG and sanitizes them. - def get_sanitized_rbconfig(config) - ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby") + block "Add OpenSSL customization file" do + # gets directories for RbConfig::CONFIG and sanitizes them. + def get_sanitized_rbconfig(config) + ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby") - config_dir = Bundler.with_clean_env do - command_output = %x|#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['#{config}']"|.strip - windows_safe_path(command_output) - end - - if config_dir.nil? || config_dir.empty? - raise "could not determine embedded ruby's RbConfig::CONFIG['#{config}']" - end + config_dir = Bundler.with_clean_env do + command_output = %x|#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['#{config}']"|.strip + windows_safe_path(command_output) + end - config_dir + if config_dir.nil? || config_dir.empty? + raise "could not determine embedded ruby's RbConfig::CONFIG['#{config}']" end + config_dir + end + + if windows? embedded_ruby_site_dir = get_sanitized_rbconfig('sitelibdir') embedded_ruby_lib_dir = get_sanitized_rbconfig('rubylibdir') @@ -67,6 +67,16 @@ build do f.write(unpatched_openssl_rb) f.write("\nOpenSSL.fips_mode = true\n") end + else + embedded_ruby_lib_dir = get_sanitized_rbconfig('rubylibdir') + source_openssl_rb = File.join(embedded_ruby_lib_dir, "openssl.rb") + File.open(source_openssl_rb, "r+") do |f| + unpatched_openssl_rb = f.read + f.rewind + f.write(unpatched_openssl_rb) + f.write("\nOpenSSL.fips_mode = true\n") + + end end end end |