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 24, 2024
1 parent 5ed6c4b commit e30b14c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions config/software/openssl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@
"libssl-3-x64",
]

puts "My Msys install dir is: #{ENV["MSYS2_INSTALL_DIR"]} "
puts "My Msys path is : #{msys_path}"

dlls.each do |dll|
mingw = ENV["MSYSTEM"].downcase
# Starting omnibus-toolchain version 1.1.115 we do not build msys2 as a part of omnibus-toolchain anymore, but pre install it in image
Expand All @@ -252,8 +255,6 @@
windows_path = "#{msys_path}/#{mingw}/bin/#{dll}.dll"
if File.exist?(windows_path)
copy windows_path, "#{install_dir}/embedded/bin/#{dll}.dll"
else
raise "Cannot find required DLL needed for dynamic linking: #{windows_path}"
end
end

Expand Down

0 comments on commit e30b14c

Please sign in to comment.