diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-01-13 00:59:34 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-06-23 16:41:05 -0700 |
| commit | 6a9ed8cc9a4df568ee0df35964f87007bfc730df (patch) | |
| tree | 798f48e43d2ddbf9975eb4e60ce972b8e39dc71d /lib/chef/encrypted_data_bag_item/decryptor.rb | |
| parent | d111e820f1f3dba3e759f6f06bbeac30f8aa1389 (diff) | |
| download | chef-6a9ed8cc9a4df568ee0df35964f87007bfc730df.tar.gz | |
replace yajl and json gem with ffi-yajl
Diffstat (limited to 'lib/chef/encrypted_data_bag_item/decryptor.rb')
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/decryptor.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/encrypted_data_bag_item/decryptor.rb b/lib/chef/encrypted_data_bag_item/decryptor.rb index 9ee38a12c4..69b8d62e3b 100644 --- a/lib/chef/encrypted_data_bag_item/decryptor.rb +++ b/lib/chef/encrypted_data_bag_item/decryptor.rb @@ -17,7 +17,7 @@ # require 'yaml' -require 'yajl' +require 'ffi_yajl' require 'openssl' require 'base64' require 'digest/sha2' @@ -121,8 +121,8 @@ class Chef::EncryptedDataBagItem end def for_decrypted_item - Yajl::Parser.parse(decrypted_data)["json_wrapper"] - rescue Yajl::ParseError + FFI_Yajl::Parser.parse(decrypted_data)["json_wrapper"] + rescue FFI_Yajl::ParseError # convert to a DecryptionFailure error because the most likely scenario # here is that the decryption step was unsuccessful but returned bad # data rather than raising an error. |