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

Add gems for ECC algorithm support to omnibus.

12 files changed, 170 insertions, 153 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
 
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 7fa47ed3dd..4489b5f247 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -12,13 +12,13 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.5.1)
-    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)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -50,7 +50,7 @@ GEM
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
@@ -63,7 +63,7 @@ GEM
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docker-api (1.33.1)
       excon (>= 0.38.0)
       json
@@ -71,7 +71,7 @@ GEM
     excon (0.54.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -80,7 +80,7 @@ GEM
     hashie (3.4.6)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (1.8.0)
+    inspec (1.9.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -96,7 +96,7 @@ GEM
       thor (~> 0.19)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.0.2)
+    json (2.0.3)
     kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
@@ -107,7 +107,7 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.21.1)
+    kitchen-vagrant (1.0.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -115,7 +115,7 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
@@ -132,10 +132,10 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       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)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
     nori (2.6.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -196,23 +196,23 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     sslshake (1.0.13)
-    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)
     timers (4.0.4)
       hitimes
-    train (0.22.0)
+    train (0.22.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
     varia_model (0.4.1)
@@ -220,7 +220,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.1)
+    winrm (2.1.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -254,4 +254,4 @@ DEPENDENCIES
   winrm-elevated
 
 BUNDLED WITH
-   1.13.6
+   1.12.5
diff --git a/chef.gemspec b/chef.gemspec
index e7f0cd122b..2d5544aa4f 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,9 +26,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 2.9", "< 5.0"
-  s.add_dependency "rbnacl-libsodium", "~> 1.0.0"
-  s.add_dependency "rbnacl", "~> 4.0.0"
-  s.add_dependency "bcrypt_pbkdf", "~> 1.0.0"
   s.add_dependency "net-ssh-multi", "~> 1.1"
   s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
   s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index bf6b9f2c95..6d8f40436a 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -1,12 +1,12 @@
 DEPENDENCIES
   awesome_customers_rhel
     git: https://github.com/learn-chef/awesome_customers_rhel.git
-    revision: 1ac86593829610c0eab7a45d9c63c09a9cea1754
+    revision: b576fcf2988e2cdf156e7ba6ff59a94d556e16f1
   awesome_customers_rhel_wrapper
     path: cookbooks/awesome_customers_rhel_wrapper
   awesome_customers_ubuntu
     git: https://github.com/learn-chef/awesome_customers_ubuntu.git
-    revision: 71927c094d570e6fd0f8bfbcc02ebe3556af2a16
+    revision: fea174c5855266f28218f76f00f6eff69e850244
   awesome_customers_ubuntu_wrapper
     path: cookbooks/awesome_customers_ubuntu_wrapper
   base
@@ -52,18 +52,18 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (7.0.2)
-    compat_resource (>= 12.14)
+  build-essential (7.0.3)
+    compat_resource (>= 12.16.3)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (7.0.1)
+  chef-client (7.1.0)
     cron (>= 1.7.0)
     logrotate (>= 1.9.0)
     windows (>= 1.42.0)
   chef-sugar (3.4.0)
   chef_hostname (0.4.2)
     compat_resource (>= 0.0.0)
-  compat_resource (12.16.2)
+  compat_resource (12.16.3)
   cron (3.0.0)
   database (6.1.1)
     postgresql (>= 1.0.0)
@@ -73,18 +73,18 @@ GRAPH
     compat_resource (>= 12.14.6)
   iis (5.0.5)
     windows (>= 1.34.6)
-  iptables (3.0.1)
+  iptables (3.1.0)
     compat_resource (>= 12.14.3)
   logrotate (2.1.0)
     compat_resource (>= 0.0.0)
-  mariadb (0.3.3)
+  mariadb (1.0.1)
     apt (>= 0.0.0)
     yum (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  mingw (1.2.4)
-    compat_resource (>= 0.0.0)
+  mingw (1.2.5)
+    compat_resource (>= 12.16.3)
     seven_zip (>= 0.0.0)
-  multipackage (3.0.28)
+  multipackage (4.0.0)
     compat_resource (>= 0.0.0)
   mysql (7.2.0)
     smf (>= 0.0.0)
@@ -95,12 +95,12 @@ GRAPH
     mysql (>= 6.0)
   nscd (4.1.0)
     compat_resource (>= 0.0.0)
-  ntp (3.2.0)
-  ohai (4.2.2)
-    compat_resource (>= 12.14)
-  openssh (2.1.0)
+  ntp (3.3.1)
+  ohai (4.2.3)
+    compat_resource (>= 12.14.7)
+  openssh (2.1.1)
     iptables (>= 1.0)
-  openssl (6.0.0)
+  openssl (6.1.1)
   php (1.5.0)
     build-essential (>= 0.0.0)
     iis (>= 0.0.0)
@@ -108,9 +108,9 @@ GRAPH
     windows (>= 0.0.0)
     xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  postgresql (5.1.0)
-    apt (>= 1.9.0)
+  postgresql (6.0.1)
     build-essential (>= 2.0.0)
+    compat_resource (>= 12.16.3)
     openssl (>= 4.0)
   rbac (1.0.3)
   resolver (1.3.1)
@@ -119,16 +119,16 @@ GRAPH
     windows (>= 1.2.2)
   smf (2.2.8)
     rbac (>= 1.0.1)
-  sudo (3.1.0)
+  sudo (3.3.1)
   ubuntu (2.0.0)
     apt (>= 0.0.0)
   users (4.0.3)
   windows (2.1.1)
     ohai (>= 4.0.0)
-  xml (3.0.0)
+  xml (3.1.1)
     build-essential (>= 0.0.0)
   yum (4.1.0)
-  yum-epel (2.0.0)
-    compat_resource (>= 12.14.6)
-  yum-mysql-community (2.0.2)
-    compat_resource (>= 12.14.7)
+  yum-epel (2.1.1)
+    compat_resource (>= 12.16.3)
+  yum-mysql-community (2.0.3)
+    compat_resource (>= 12.16.3)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index ad89269a75..4b6b595d1f 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -9,3 +9,4 @@ gem "kitchen-vagrant"
 gem "ridley"
 gem "test-kitchen"
 gem "vagrant-wrapper"
+gem "rainbow", ">= 2.1.0", "< 2.2"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 957b478396..86aa1f9aec 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -4,15 +4,15 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.5.1)
-    aws-sdk (2.6.32)
-      aws-sdk-resources (= 2.6.32)
-    aws-sdk-core (2.6.32)
+    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.32)
-      aws-sdk-core (= 2.6.32)
+    aws-sdk-resources (2.6.48)
+      aws-sdk-core (= 2.6.48)
     aws-sigv4 (1.0.0)
-    berkshelf (5.2.0)
+    berkshelf (5.4.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -27,7 +27,7 @@ GEM
       retryable (~> 2.0)
       ridley (~> 5.0)
       solve (> 2.0, < 4.0)
-      thor (~> 0.19)
+      thor (~> 0.19, < 0.19.2)
     berkshelf-api-client (3.0.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -40,29 +40,29 @@ GEM
     buff-ruby_engine (1.0.0)
     buff-shell_out (1.1.0)
       buff-ruby_engine (~> 1.0)
-    builder (3.2.2)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.16.42)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
-    docker-api (1.33.0)
+    diff-lcs (1.3)
+    docker-api (1.33.1)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
     excon (0.54.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
-    ffi (1.9.14-x86-mingw32)
+    ffi (1.9.17)
+    ffi (1.9.17-x86-mingw32)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -71,8 +71,8 @@ GEM
     hashie (3.4.6)
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
-    httpclient (2.8.2.4)
-    inspec (1.7.0)
+    httpclient (2.8.3)
+    inspec (1.9.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -86,12 +86,12 @@ GEM
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.20.1, < 1.0)
+      train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.0.2)
+    json (2.0.3)
     kitchen-appbundle-updater (0.1.2)
-    kitchen-dokken (1.0.7)
-      docker-api (~> 1.32)
+    kitchen-dokken (1.1.0)
+      docker-api (~> 1.33)
       test-kitchen (~> 1.13)
     kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
@@ -99,11 +99,11 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.16.1)
+    kitchen-inspec (0.17.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.21.0)
+    kitchen-vagrant (1.0.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -111,12 +111,12 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (2.1.7)
+    mixlib-install (2.1.9)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -127,15 +127,15 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.4)
+    molinillo (0.5.5)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       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)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
     nori (2.6.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -144,7 +144,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rainbow (2.1.0)
     retryable (2.0.4)
     ridley (5.1.0)
@@ -196,23 +196,23 @@ GEM
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     sslshake (1.0.13)
-    test-kitchen (1.14.0)
+    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)
+    thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.22.0)
+    train (0.22.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
     vagrant-wrapper (2.0.3)
@@ -221,7 +221,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (2.1.0)
+    winrm (2.1.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -230,7 +230,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.0.0)
+    winrm-fs (1.0.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -248,9 +248,10 @@ DEPENDENCIES
   kitchen-ec2
   kitchen-inspec
   kitchen-vagrant
+  rainbow (>= 2.1.0, < 2.2)
   ridley
   test-kitchen
   vagrant-wrapper
 
 BUNDLED WITH
-   1.13.6
+   1.12.5
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e64c4659b4..8454d6aed4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/license_scout.git
-  revision: 95a308e01848e7843c84fa9be6214fa06e30f436
+  revision: 4bf6f5cf21bc0ff8de327dfc0a245b625134d6b0
   specs:
     license_scout (0.1.2)
       ffi-yajl (~> 2.2)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: cd69f8563fa8875c82a4e44652ffbfdac7ef201d
+  revision: f4b1c0f2682907967d10c64850f9c607070697dd
   branch: shain/ruby_windows_monster
   specs:
     omnibus-software (4.0.0)
@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus.git
-  revision: 0612bf6333b2a7b125e599228ec6c46cbaa3ed3d
+  revision: dce5283a85a44484a66a8a84991beba92e46fd12
   branch: rhass/COOL-502_with_gcc_investigate
   specs:
     omnibus (5.5.0)
@@ -35,15 +35,18 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
-    artifactory (2.5.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    artifactory (2.5.1)
     awesome_print (1.7.0)
-    aws-sdk (2.6.18)
-      aws-sdk-resources (= 2.6.18)
-    aws-sdk-core (2.6.18)
+    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.18)
-      aws-sdk-core (= 2.6.18)
+    aws-sdk-resources (2.6.48)
+      aws-sdk-core (= 2.6.48)
+    aws-sigv4 (1.0.0)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -76,14 +79,14 @@ GEM
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (9.0.6)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.15.19)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -95,8 +98,8 @@ GEM
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
-    ffi (1.9.14-x86-mingw32)
+    ffi (1.9.17)
+    ffi (1.9.17-x86-mingw32)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
@@ -111,7 +114,7 @@ GEM
     iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.3.1)
-    json (2.0.2)
+    json (2.0.3)
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
@@ -121,13 +124,13 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.6)
+    mixlib-install (2.1.9)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -143,14 +146,14 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       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)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
     nori (2.6.0)
-    octokit (4.4.1)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.21.0)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ohai (8.22.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -169,17 +172,18 @@ GEM
       progressbar
       zhexdump (>= 0.0.2)
     plist (3.2.0)
-    progressbar (0.21.0)
+    progressbar (1.8.2)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.0)
+    pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
+    public_suffix (2.0.5)
     retryable (2.0.4)
     ridley (4.6.1)
       addressable
@@ -203,24 +207,24 @@ GEM
     rubyntlm (0.6.1)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
     semverse (1.2.1)
     slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.13.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.1)
+    thor (0.19.4)
     timers (4.0.4)
       hitimes
     varia_model (0.4.1)
@@ -228,7 +232,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (2.1.0)
+    winrm (2.1.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -237,7 +241,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.0.0)
+    winrm-fs (1.0.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
diff --git a/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb b/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb
new file mode 100644
index 0000000000..1f7f4d3207
--- /dev/null
+++ b/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb
@@ -0,0 +1,10 @@
+# gem installs this gem from the version specified in chef's Gemfile.lock
+# so we can take advantage of omnibus's caching. Just duplicate this file and
+# add the new software def to chef software def if you want to separate
+# another gem's installation.
+require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def"
+BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
+
+license "MIT"
+license_file "https://raw.githubusercontent.com/mfazekas/bcrypt_pbkdf-ruby/master/COPYING"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-rbnacl-libsodium.rb b/omnibus/config/software/chef-gem-rbnacl-libsodium.rb
new file mode 100644
index 0000000000..90bbc69dfb
--- /dev/null
+++ b/omnibus/config/software/chef-gem-rbnacl-libsodium.rb
@@ -0,0 +1,10 @@
+# gem installs this gem from the version specified in chef's Gemfile.lock
+# so we can take advantage of omnibus's caching. Just duplicate this file and
+# add the new software def to chef software def if you want to separate
+# another gem's installation.
+require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def"
+BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
+
+license "MIT"
+license_file "https://raw.githubusercontent.com/cryptosphere/rbnacl-libsodium/master/LICENSE"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index c6ced7e566..c53a2339ae 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -44,6 +44,10 @@ dependency "chef-gem-ruby-prof"
 dependency "chef-gem-byebug"
 dependency "chef-gem-debug_inspector"
 dependency "chef-gem-binding_of_caller"
+unless ios_xr? || solaris?
+  dependency "chef-gem-rbnacl-libsodium"
+  dependency "chef-gem-bcrypt_pbkdf-ruby"
+end
 
 # Now everyone else, in alphabetical order because we don't care THAT much
 Dir.entries(File.dirname(__FILE__)).sort.each do |gem_software|
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0d740ff046..be544badca 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,7 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
 override :rubygems, version: "2.6.8"
 override :bundler, version: "1.12.5"
+override :rainbow, version: "2.1.0"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
 override "liblzma", version: "5.2.2"
diff --git a/version_policy.rb b/version_policy.rb
index 5621ea43ff..a16e7ad500 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -21,6 +21,7 @@ OMNIBUS_OVERRIDES = {
   ## according to comment in omnibus-sw, latest versions don't work on solaris
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
   :bundler => "1.12.5", # until we figure out how to work with 1.13.0
+  :rainbow => "2.1.0", # Currently pinned until rubygems is updated
   "libffi" => "3.2.1",
   "libiconv" => "1.14",
   "liblzma" => "5.2.2",