Skip to content

Commit

Permalink
Got it! have to adjust FIPS now, moving FIPS support back to the main…
Browse files Browse the repository at this point in the history
… openssl.rb file for v3 and laster in onnibus-software

Signed-off-by: John McCrae <john.mccrae@progress.com>
  • Loading branch information
johnmccrae committed Apr 25, 2024
1 parent 1c77df6 commit b851b93
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions config/software/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -317,36 +317,36 @@
if windows?
# Needed now that we switched to msys2 and have not figured out how to tell
# it how to statically link yet
build do
if version.satisfies?("~> 3.0.0") && fips_mode?
require 'find'
puts "***************************"
puts "** Searching for Openssl **"
puts "***************************"
Find.find('openssl.exe') { |f| puts f }


files = [
"libcrypto-3-x64.dll",
"libssl-3-x64.dll",
"openssl.exe",
]

files.each do |file|
# mingw = ENV["MSYSTEM"].downcase
msys_path = ENV["MSYS2_INSTALL_DIR"] ? "#{ENV["MSYS2_INSTALL_DIR"]}" : "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin"
windows_path = "#{msys_path}/usr/local/bin/#{file}"
puts "checking for this file: #{windows_path}"

if File.exist?(windows_path)
puts "writing openssl file #{file} to the /embedded directory"
copy windows_path, "#{install_dir}/embedded/bin/#{file}"
end
end
end
end
%w{ erb gem irb rdoc ri bundle }.each do |cmd|
# build do
# if version.satisfies?("~> 3.0.0") && fips_mode?
# require 'find'
# puts "***************************"
# puts "** Searching for Openssl **"
# puts "***************************"
# Find.find('openssl.exe') { |f| puts f }


# files = [
# "libcrypto-3-x64.dll",
# "libssl-3-x64.dll",
# "openssl.exe",
# ]

# files.each do |file|
# # mingw = ENV["MSYSTEM"].downcase
# msys_path = ENV["MSYS2_INSTALL_DIR"] ? "#{ENV["MSYS2_INSTALL_DIR"]}" : "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin"
# windows_path = "#{msys_path}/usr/local/bin/#{file}"
# puts "checking for this file: #{windows_path}"

# if File.exist?(windows_path)
# puts "writing openssl file #{file} to the /embedded directory"
# copy windows_path, "#{install_dir}/embedded/bin/#{file}"
# end
# end
# end
# end

%w{ erb gem irb rdoc ri bundle libcrypto-3-x64.dll libssl-3-x64.dll openssl.exe }.each do |cmd|
copy "#{project_dir}/bin/#{cmd}", "#{install_dir}/embedded/bin/#{cmd}"
end

Expand Down

0 comments on commit b851b93

Please sign in to comment.