hiera-crypt 0.2.1 → 0.3

data/bin/hiera-crypt

@@ -44,9 +44,9 @@ crypto = PasswordBox.new(password)
 in_file = input == '-' ? STDIN : File.open(input, 'r')
 
 if mode == :encrypt
-  out = crypto.box(in_file.read, :base64)
+  out = crypto.box(in_file.read)
 elsif mode == :decrypt
-  out = crypto.open(in_file.read, :base64)
+  out = crypto.open(in_file.read)
 end
 
 out_file = output == '-' ? STDOUT : File.open(output, 'w')

data/hiera-crypt.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "hiera-crypt"
-  spec.version       = "0.2.1"
+  spec.version       = "0.3"
   spec.authors       = ["Carl Jackson"]
   spec.email         = ["carl@avtok.com"]
   spec.description   = "Encrypted file backend for Hiera"
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "hiera", "~> 1.2.1"
   spec.add_dependency "pbkdf2", "~> 0.1.0"
-  spec.add_dependency "rbnacl", "~> 1.1.0"
+  spec.add_dependency "rbnacl", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/hiera/backend/crypt_backend.rb

@@ -44,7 +44,7 @@ class Hiera
           next unless File.exist?(file)
 
           plaintext = @cache.read(file, String) do |data|
-            @crypto.open(data, :base64)
+            @crypto.open(data)
           end
 
           return plaintext if resolution_type == :priority

data/lib/passwordbox.rb

@@ -1,10 +1,10 @@
-require 'rbnacl'
+require 'base64'
 require 'pbkdf2'
-require 'forwardable'
+require 'rbnacl'
 
 # A SecretBox that (like RandomNonceBox) automatically generates a suitable
 # nonce, but also which uses PBKDF2 to derive a password of the right length.
-class PasswordBox < Crypto::SecretBox
+class PasswordBox < RbNaCl::SecretBox
   DEFAULT_PBKDF2_ITERS = 5000
 
   # Create a new PasswordBox
@@ -18,14 +18,14 @@ class PasswordBox < Crypto::SecretBox
   # a random nonce.
   #
   # @param message [String] The message to encrypt
-  # @param encoding [Symbol] Encoding for the returned ciphertext
   #
   # @return [String] The encrypted message
-  def box(message, encoding = :raw)
+  def box(message)
     nonce = generate_nonce
     salt, iters, @key = generate_key
     ciphertext = super(nonce, message)
-    Crypto::Encoder[encoding].encode(nonce + salt + iters + ciphertext)
+
+    Base64.encode64(nonce + salt + iters + ciphertext)
   end
   alias encrypt box
 
@@ -33,13 +33,12 @@ class PasswordBox < Crypto::SecretBox
   # the message.
   #
   # @param enciphered_message [String] The message to decrypt
-  # @param encoding [Symbol] Encoding for the given ciphertext
   #
   # @raise [CryptoError] If the message has been tampered with.
   #
   # @return [String] The plaintext of the message
-  def open(enciphered_message, encoding = :raw)
-    decoded = Crypto::Encoder[encoding].decode(enciphered_message)
+  def open(enciphered_message)
+    decoded = Base64.decode64(enciphered_message)
     nonce, salt, iters, ciphertext = extract(decoded)
     @key = generate_key(salt, iters).last
     super(nonce, ciphertext)
@@ -48,7 +47,7 @@ class PasswordBox < Crypto::SecretBox
 
   private
   def generate_nonce
-    Crypto::Random.random_bytes(nonce_bytes)
+    RbNaCl::Random.random_bytes(nonce_bytes)
   end
   def generate_key(salt=nil, iters=DEFAULT_PBKDF2_ITERS)
     salt ||= generate_nonce

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-crypt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,3 +153,4 @@ test_files:
 - test/hiera-file.yaml
 - test/hiera-inline.yaml
 - test/password
+has_rdoc: