strongroom 0.0.2 → 1.0.0

data/.travis.yml

@@ -1 +1,5 @@
-rvm: 1.9.2
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec # See: strongroom.gemspec

data/README.md

@@ -1,6 +1,8 @@
 Strongroom
 ==========
 
+[![Build Status](https://travis-ci.org/pda/strongroom.png?branch=master)](https://travis-ci.org/pda/strongroom)
+
 Strong public-key encryption for arbitrary length data.
 
 

data/lib/strongroom/enigma.rb

@@ -1,8 +1,13 @@
 require "base64"
+require "yaml"
 
 module Strongroom
   class Enigma
 
+    # "ASCII-8BIT" is Ruby's "BINARY" type:
+    #   Encoding.aliases["BINARY"] # => "ASCII-8BIT"
+    BINARY = "ASCII-8BIT"
+
     def initialize parameters
       @cipher = parameters.fetch :cipher
       @ciphertext = parameters.fetch :ciphertext
@@ -19,12 +24,11 @@ module Strongroom
     end
 
     def to_hash
-      {
-        "cipher" => cipher,
-        "ciphertext" => Base64.encode64(ciphertext),
-        "encrypted_key" => Base64.encode64(encrypted_key),
-        "iv" => Base64.encode64(iv)
-      }
+      Hash[
+        to_hash_with_default_encoding.map do |key, value|
+          [key.dup.force_encoding(BINARY), value.force_encoding(BINARY)]
+        end
+      ]
     end
 
     def self.from_hash hash
@@ -37,12 +41,23 @@ module Strongroom
     end
 
     def serialize
-      to_hash.to_yaml.encode!("US-ASCII")
+      YAML.dump(to_hash).force_encoding(BINARY)
     end
 
     def self.deserialize input
       from_hash YAML.load(input)
     end
 
+    private
+
+    def to_hash_with_default_encoding
+      {
+        "cipher" => cipher,
+        "ciphertext" => Base64.encode64(ciphertext),
+        "encrypted_key" => Base64.encode64(encrypted_key),
+        "iv" => Base64.encode64(iv)
+      }
+    end
+
   end
 end

data/lib/strongroom/version.rb

@@ -1,3 +1,3 @@
 module Strongroom
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "pathname"
 $LOAD_PATH.unshift Pathname(__FILE__).dirname.parent.join("lib").to_path
 
 require "minitest/autorun"
+require "turn"
 
 require "strongroom"
 

data/spec/strongroom_decryptor_spec.rb

@@ -3,24 +3,24 @@ require_relative "spec_helper"
 describe Strongroom::Decryptor do
 
   before do
-    @cipher = ::MiniTest::Mock.new.tap do |c|
-      c.expect :decrypt, nil
-      c.expect :key=, "plainkey", [ "plainkey" ]
-      c.expect :iv=, "iv", [ "iv" ]
-      c.expect :update, "original inp", [ "ciphertext==" ]
-      c.expect :final, "ut"
-    end
-    @key = ::MiniTest::Mock.new.tap do |k|
-      k.expect :private_decrypt, "plainkey", [ "ekey" ]
-    end
-    @enigma = ::MiniTest::Mock.new.tap do |e|
-      e.expect :ciphertext, "ciphertext=="
-      e.expect :encrypted_key, "ekey"
-      e.expect :iv, "iv"
-    end
-    @cipher_locator = ::MiniTest::Mock.new.tap do |cl|
-      cl.expect :for, @cipher, [ @enigma ]
-    end
+    @cipher = ::MiniTest::Mock.new
+    @cipher.expect :decrypt, nil
+    @cipher.expect :key=, "plainkey", [ "plainkey" ]
+    @cipher.expect :iv=, "iv", [ "iv" ]
+    @cipher.expect :update, "original inp", [ "ciphertext==" ]
+    @cipher.expect :final, "ut"
+
+    @key = ::MiniTest::Mock.new
+    def @key.is_a?(type); false; end
+    @key.expect :private_decrypt, "plainkey", [ "ekey" ]
+
+    @enigma = ::MiniTest::Mock.new
+    @enigma.expect :ciphertext, "ciphertext=="
+    @enigma.expect :encrypted_key, "ekey"
+    @enigma.expect :iv, "iv"
+
+    @cipher_locator = ::MiniTest::Mock.new
+    @cipher_locator.expect :for, @cipher, [ @enigma ]
   end
 
   it "calls OpenSSL methods" do
@@ -28,6 +28,11 @@ describe Strongroom::Decryptor do
     [ @cipher, @key, @enigma ].each &:verify
   end
 
+  it "uses cipher_locator" do
+    Strongroom::Decryptor.new(@key, @cipher_locator).decrypt(@enigma)
+    @cipher_locator.verify
+  end
+
   it "returns correct plaintext" do
     Strongroom::Decryptor.new(@key, @cipher_locator).decrypt(@enigma).tap do |output|
       output.must_equal "original input"

data/spec/strongroom_encryptor_spec.rb

@@ -3,19 +3,19 @@ require_relative "spec_helper"
 describe Strongroom::Encryptor do
 
   before do
-    @cipher = ::MiniTest::Mock.new.tap do |c|
-      c.expect :name, "AES-128-TEST"
-      c.expect :encrypt, nil
-      c.expect :random_key, "rkey"
-      c.expect :key=, "rkey", [ "rkey" ]
-      c.expect :random_iv, "riv"
-      c.expect :iv=, "riv", [ "riv" ]
-      c.expect :update, "cipherte", [ "input" ]
-      c.expect :final, "xt=="
-    end
-    @key = ::MiniTest::Mock.new.tap do |k|
-      k.expect :public_encrypt, "encryptedkey", [ "rkey" ]
-    end
+    @cipher = ::MiniTest::Mock.new
+    @cipher.expect :name, "AES-128-TEST"
+    @cipher.expect :encrypt, nil
+    @cipher.expect :random_key, "rkey"
+    @cipher.expect :key=, "rkey", [ "rkey" ]
+    @cipher.expect :random_iv, "riv"
+    @cipher.expect :iv=, "riv", [ "riv" ]
+    @cipher.expect :update, "cipherte", [ "input" ]
+    @cipher.expect :final, "xt=="
+
+    @key = ::MiniTest::Mock.new
+    def @key.is_a?(type); false; end
+    @key.expect :public_encrypt, "encryptedkey", [ "rkey" ]
   end
 
   it "calls OpenSSL methods" do

data/spec/strongroom_enigma_spec.rb

@@ -2,9 +2,11 @@ require_relative "spec_helper"
 
 describe Strongroom::Enigma do
 
-  # binary guaranteed to be invalid as US-ASCII or UTF-8
+  # Generates a string guaranteed to be invalid as US-ASCII or UTF-8.
+  # Encoding set to "ASCII-8BIT" as this is Ruby's "BINARY" type:
+  #   Encoding.aliases["BINARY"] # => "ASCII-8BIT"
   def binary input
-    "\xFF" << input
+    ("\xFF" << input).force_encoding("ASCII-8BIT")
   end
 
   # input has non-valid-character-encoding byte added, then base64 encoded
@@ -35,39 +37,38 @@ describe Strongroom::Enigma do
 
   describe "#to_hash" do
     it "has string keys, binary values base64 encoded" do
-      enigma.to_hash.tap do |h|
-        h["cipher"].must_equal "AES-128-TEST"
-        h["ciphertext"].must_equal bin64("ct")
-        h["encrypted_key"].must_equal bin64("ek")
-        h["iv"].must_equal bin64("iv")
-      end
+      h = enigma.to_hash
+      h["cipher"].must_equal "AES-128-TEST"
+      h["ciphertext"].must_equal bin64("ct")
+      h["encrypted_key"].must_equal bin64("ek")
+      h["iv"].must_equal bin64("iv")
     end
-    it "has US-ASCII keys and values" do
-      enigma.to_hash.tap do |h|
-        h.each do |key, value|
-          key.encoding.name.must_equal "US-ASCII"
-          key.valid_encoding?.must_equal true
-          value.encoding.name.must_equal "US-ASCII"
-          value.valid_encoding?.must_equal true
-        end
+    it "has ASCII-8BIT keys and values" do
+      h = enigma.to_hash
+      h.each do |key, value|
+        key.encoding.name.must_equal "ASCII-8BIT"
+        key.valid_encoding?.must_equal true
+        value.encoding.name.must_equal "ASCII-8BIT"
+        value.valid_encoding?.must_equal true
       end
     end
   end
 
   describe ".from_hash" do
-    it "accepts hash with string keys for easy deserialization" do
-      hash = {
+    let(:hash) do
+      {
         "cipher" => "AES-128-TEST",
         "ciphertext" => bin64("test_ct"),
         "encrypted_key" => bin64("test_ek"),
         "iv" => bin64("test_iv")
       }
-      Strongroom::Enigma.from_hash(hash).tap do |e|
-        e.cipher.must_equal "AES-128-TEST"
-        e.ciphertext.must_equal binary("test_ct")
-        e.encrypted_key.must_equal binary("test_ek")
-        e.iv.must_equal binary("test_iv")
-      end
+    end
+    it "accepts hash with string keys for easy deserialization" do
+      e = Strongroom::Enigma.from_hash(hash)
+      e.cipher.must_equal "AES-128-TEST"
+      e.ciphertext.must_equal binary("test_ct")
+      e.encrypted_key.must_equal binary("test_ek")
+      e.iv.must_equal binary("test_iv")
     end
   end
 
@@ -79,20 +80,19 @@ describe Strongroom::Enigma do
     it "is not empty" do
       s.wont_be_empty
     end
-    it "has is valid US-ASCII" do
-      s.encoding.name.must_equal "US-ASCII"
+    it "is valid ASCII-8BIT" do
+      s.encoding.name.must_equal "ASCII-8BIT"
       s.valid_encoding?.must_equal true
     end
   end
 
   describe ".deserialize" do
     it "correctly deserializes output from #serialize" do
-      Strongroom::Enigma.deserialize(enigma.serialize).tap do |e|
-        e.cipher.must_equal "AES-128-TEST"
-        e.ciphertext.must_equal binary("ct")
-        e.encrypted_key.must_equal binary("ek")
-        e.iv.must_equal binary("iv")
-      end
+      e = Strongroom::Enigma.deserialize(enigma.serialize)
+      e.cipher.must_equal "AES-128-TEST"
+      e.ciphertext.must_equal binary("ct")
+      e.encrypted_key.must_equal binary("ek")
+      e.iv.must_equal binary("iv")
     end
   end
 

data/spec/strongroom_has_rsa_key_spec.rb

@@ -10,7 +10,7 @@ describe Strongroom::HasRsaKey do
   end
 
   it "passes through non-String objects" do
-    key = MiniTest::Mock.new
+    key = Object.new
     klass.new(key).send(:rsa_key).must_equal key
   end
 

data/strongroom.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.2"
 
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "simplecov"
   gem.add_development_dependency "sdoc"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "turn"
 end

metadata

@@ -1,71 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: strongroom
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Paul Annesley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-21 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: simplecov
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sdoc
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  name: turn
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Strong public-key encryption for arbitrary length data.
-email: 
+email:
 - paul@annesley.cc
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -86,41 +118,32 @@ files:
 - spec/strongroom_has_rsa_key_spec.rb
 - spec/strongroom_spec.rb
 - strongroom.gemspec
-has_rdoc: true
 homepage: https://github.com/learnable/strongroom
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Strongroom uses RSA and AES encryption from Ruby's OpenSSL bindings to encrypt arbitrary length data with a public key.
-test_files: 
+summary: Strongroom uses RSA and AES encryption from Ruby's OpenSSL bindings to encrypt
+  arbitrary length data with a public key.
+test_files:
 - spec/fixtures/private_key
 - spec/fixtures/public_key
 - spec/spec_helper.rb
@@ -129,3 +152,4 @@ test_files:
 - spec/strongroom_enigma_spec.rb
 - spec/strongroom_has_rsa_key_spec.rb
 - spec/strongroom_spec.rb
+has_rdoc: