Merge pull request #5590 from inspec/vasundhara/remove_x25519_gem

Need to back out x25519 gem as its causing issues for ssh
This commit is contained in:
Clinton Wolfe 2021-07-20 13:14:00 -04:00 committed by GitHub
commit 94dfc69c52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

11
Gemfile
View file

@ -20,22 +20,11 @@ end
# but our runtime dep is still 3.9+
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
gem "rb-readline"
gem "appbundler"
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
if probably_x86?
gem "x25519" # ed25519 KEX module, not supported on ARM
end
end
group :test do