Merge pull request #5736 from chef/rhass/COOL-657_ecc-algorithm-support

Add gems for ECC algorithm support to omnibus.

1 files changed, 24 insertions, 36 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 8319f5fe5f..5a6a25ae6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: 2d06ce7ef5976e2a410906f60152142bf90a17fb
+  revision: e32b083df4820d8d78ad92094aa2b209e08d3f31
   specs:
     oc-chef-pedant (2.2.0)
       activesupport (>= 4.2.7.1, < 6.0)
@@ -49,7 +49,6 @@ PATH
   specs:
     chef (12.18.39)
       addressable
-      bcrypt_pbkdf (~> 1.0.0)
       bundler (>= 1.10)
       chef-config (= 12.18.39)
       chef-zero (>= 4.8)
@@ -69,8 +68,6 @@ PATH
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rbnacl (~> 4.0.0)
-      rbnacl-libsodium (~> 1.0.0)
       rspec-core (~> 3.5)
       rspec-expectations (~> 3.5)
       rspec-mocks (~> 3.5)
@@ -81,7 +78,6 @@ PATH
       uuidtools (~> 2.1.5)
     chef (12.18.39-universal-mingw32)
       addressable
-      bcrypt_pbkdf (~> 1.0.0)
       bundler (>= 1.10)
       chef-config (= 12.18.39)
       chef-zero (>= 4.8)
@@ -102,8 +98,6 @@ PATH
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rbnacl (~> 4.0.0)
-      rbnacl-libsodium (~> 1.0.0)
       rspec-core (~> 3.5)
       rspec-expectations (~> 3.5)
       rspec-mocks (~> 3.5)
@@ -145,20 +139,18 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.5.1)
     ast (2.3.0)
-    aws-sdk (2.6.44)
-      aws-sdk-resources (= 2.6.44)
-    aws-sdk-core (2.6.44)
+    aws-sdk (2.6.48)
+      aws-sdk-resources (= 2.6.48)
+    aws-sdk-core (2.6.48)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.44)
-      aws-sdk-core (= 2.6.44)
+    aws-sdk-resources (2.6.48)
+      aws-sdk-core (= 2.6.48)
     aws-sigv4 (1.0.0)
     backports (3.6.8)
-    bcrypt_pbkdf (1.0.0)
-    bcrypt_pbkdf (1.0.0-x86-mingw32)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (9.0.6)
     chef-api (0.7.0)
       logify (~> 0.1)
@@ -205,7 +197,7 @@ GEM
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
     debug_inspector (0.0.2)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
@@ -213,16 +205,16 @@ GEM
     ethon (0.10.1)
       ffi (>= 1.3.0)
     excon (0.54.0)
-    faraday (0.10.1)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    faraday_middleware (0.10.1)
+    faraday_middleware (0.11.0)
       faraday (>= 0.7.4, < 1.0)
     fauxhai (3.10.0)
       net-ssh
-    ffi (1.9.14)
-    ffi (1.9.14-x86-mingw32)
+    ffi (1.9.17)
+    ffi (1.9.17-x86-mingw32)
     ffi-win32-extensions (1.0.3)
       ffi
     ffi-yajl (2.3.0)
@@ -279,7 +271,7 @@ GEM
     kitchen-sync (2.1.1)
       net-sftp
       test-kitchen (>= 1.0.0)
-    kitchen-vagrant (0.21.1)
+    kitchen-vagrant (1.0.0)
       test-kitchen (~> 1.4)
     knife-windows (1.8.0)
       winrm (~> 2.1)
@@ -298,7 +290,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
@@ -325,7 +317,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.0.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -410,10 +402,6 @@ GEM
     rainbow (2.2.1)
     rake (11.3.0)
     rb-readline (0.5.3)
-    rbnacl (4.0.1)
-      ffi
-    rbnacl-libsodium (1.0.11)
-      rbnacl (>= 3.0.1)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -462,7 +450,7 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    serverspec (2.37.2)
+    serverspec (2.38.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -474,9 +462,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.66.3)
+    specinfra (2.66.5)
       net-scp
-      net-ssh (>= 2.7, < 4.0)
+      net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     stove (4.1.1)
@@ -484,12 +472,12 @@ GEM
       logify (~> 0.2)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.14.2)
+    test-kitchen (1.15.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.4)
@@ -514,7 +502,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unf_ext (0.0.7.2-x86-mingw32)
-    unicode-display_width (1.1.2)
+    unicode-display_width (1.1.3)
     url (0.3.2)
     uuidtools (2.1.5)
     vagrant-wrapper (2.0.3)
@@ -539,7 +527,7 @@ GEM
       ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.1.1)
+    winrm (2.1.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -558,7 +546,7 @@ GEM
       winrm (~> 2.0)
     wmi-lite (1.0.0)
     yajl-ruby (1.3.0)
-    yard (0.9.7)
+    yard (0.9.8)
     yard-classmethods (1.0.0)
       yard