Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-27 15:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5564 from inspec/cw/fix-ed25519-kex-issue

Browse source 
Restrict x25519 gem to x86 architectures
This commit is contained in:
Clinton Wolfe 2021-06-16 17:47:24 -04:00 committed by GitHub
commit f3eef435d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile
View file

@ -20,12 +20,22 @@ end
# but our runtime dep is still 3.9+ # but our runtime dep is still 3.9+
gem "rspec", ">= 3.10" gem "rspec", ">= 3.10"
def probably_x86?
# We don't currently build on ARM windows, so assume x86 there
return true if RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
# Otherwise rely on uname -m
`uname -m`.match?(/^(x86_64|i\d86)/)
end
group :omnibus do group :omnibus do
gem "rb-readline" gem "rb-readline"
gem "appbundler" gem "appbundler"
gem "ed25519" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec gem "ed25519" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
gem "bcrypt_pbkdf" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec gem "bcrypt_pbkdf" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
gem "x25519" # ed25519 KEX module if probably_x86?
gem "x25519" # ed25519 KEX module, not supported on ARM
end
end end
group :test do group :test do