encrypto 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    encrypto (0.0.1)
+    encrypto (0.0.2)
       attr_encrypted (~> 1.3.0)
-      rbnacl (~> 1.1.0)
+      rbnacl (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -23,7 +23,7 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rbnacl (1.1.0)
+    rbnacl (2.0.0)
       ffi
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/encrypto.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.homepage      = 'http://github.com/finalist/encrypto'
 
-  gem.add_dependency             "rbnacl",         "~> 1.1.0"
+  gem.add_dependency             "rbnacl",         "~> 2.0.0"
   gem.add_dependency             "attr_encrypted", "~> 1.3.0"
 
   gem.add_development_dependency "pry-nav",        "~> 0.2.3"

data/lib/encrypto/box.rb

@@ -6,24 +6,24 @@ module Encrypto
     end
 
     def box(value)
-      @nacl_box.box(value, :hex)
+      @nacl_box.box(value)
     end
 
     def open(cipher_text)
-      @nacl_box.open(cipher_text, :hex)
+      @nacl_box.open(cipher_text.clone)
     end
 
     def self.from_passphrase(passphrase)
-      passphrase_sha = Crypto::Hash.sha256(passphrase)
+      passphrase_sha = RbNaCl::Hash.sha256(passphrase)
       from_secret_key(passphrase_sha)
     end
 
     def self.from_secret_key(secret_key)
-      new(Crypto::RandomNonceBox.from_secret_key(secret_key))
+      new(RbNaCl::RandomNonceBox.from_secret_key(secret_key))
     end
 
     def self.from_keypair(public_key, private_key)
-      new(Crypto::RandomNonceBox.from_keypair(public_key, private_key))
+      new(RbNaCl::RandomNonceBox.from_keypair(public_key, private_key))
     end
 
   end

data/lib/encrypto/encrypto.rb

@@ -17,14 +17,11 @@ module Encrypto
   end
 
   def self.encrypt_with_keypair(value, public_key, signing_private_key)
-    hex_public_key = Keys.hex_public_key(public_key)
-    keypair_box(hex_public_key, signing_private_key).box(value)
+    keypair_box(public_key, signing_private_key).box(value)
   end
 
-  def self.decrypt_with_keypair(cipher_text, hex_public_key, private_key)
-    public_key = Keys.hex_public_key(hex_public_key)
-    box = Box.from_keypair(public_key, private_key)
-    box.open(cipher_text)
+  def self.decrypt_with_keypair(cipher_text, signing_public_key, private_key)
+    keypair_box(signing_public_key, private_key).open(cipher_text)
   end
 
   private

data/lib/encrypto/keys.rb

@@ -2,12 +2,16 @@ module Encrypto
   module Keys
 
     def self.generate_keypair
-      private_key = Crypto::PrivateKey.generate
-      [private_key.public_key.to_s(:hex), private_key]
+      private_key = RbNaCl::PrivateKey.generate
+      [private_key.public_key, private_key]
     end
 
-    def self.hex_public_key(value)
-      Crypto::PublicKey.new(value, :hex)
+    def self.to_bytes(key)
+      key.to_s
+    end
+
+    def self.public_key_from_bytes(bytes)
+      RbNaCl::PublicKey.new(bytes)
     end
 
   end

data/lib/encrypto/random.rb

@@ -2,7 +2,7 @@ module Encrypto
   module Random
 
     def self.bytes
-      Crypto::Random.random_bytes
+      RbNaCl::Random.random_bytes
     end
 
   end

data/lib/encrypto/version.rb

@@ -1,3 +1,3 @@
 module Encrypto
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/encrypto/box_spec.rb

@@ -7,21 +7,21 @@ module Encrypto
       let(:passphrase) { 'password' }
 
       it 'hashes the secret key' do
-        Crypto::Hash.should_receive(:sha256).with(passphrase)
-        Crypto::RandomNonceBox.stub(:from_secret_key)
+        RbNaCl::Hash.should_receive(:sha256).with(passphrase)
+        RbNaCl::RandomNonceBox.stub(:from_secret_key)
         Encrypto::Box.from_passphrase(passphrase)
       end
 
       it 'creates a random nonce box based on the hashed secret key' do
-        Crypto::Hash.stub(:sha256 => "sha")
-        Crypto::RandomNonceBox.should_receive(:from_secret_key).with("sha")
+        RbNaCl::Hash.stub(:sha256 => "sha")
+        RbNaCl::RandomNonceBox.should_receive(:from_secret_key).with("sha")
         Encrypto::Box.from_passphrase(passphrase)
       end
 
       it 'initializes with a random nonce box' do
         box = double("box")
-        Crypto::Hash.stub(:sha256 => "sha")
-        Crypto::RandomNonceBox.stub(:from_secret_key => box)
+        RbNaCl::Hash.stub(:sha256 => "sha")
+        RbNaCl::RandomNonceBox.stub(:from_secret_key => box)
         Encrypto::Box.should_receive(:new).with(box)
         Encrypto::Box.from_passphrase(passphrase)
       end
@@ -32,13 +32,13 @@ module Encrypto
       let(:private_key) { double("private key") }
 
       it "creates a random nonce box based on the keypair" do
-        Crypto::RandomNonceBox.should_receive(:from_keypair).with(public_key, private_key)
+        RbNaCl::RandomNonceBox.should_receive(:from_keypair).with(public_key, private_key)
         Encrypto::Box.from_keypair(public_key, private_key)
       end
 
       it "initializes with a random nonce box" do
         box = double("box")
-        Crypto::RandomNonceBox.stub(:from_keypair => box)
+        RbNaCl::RandomNonceBox.stub(:from_keypair => box)
         Encrypto::Box.should_receive(:new).with(box)
         Encrypto::Box.from_keypair(public_key, private_key)
       end
@@ -49,7 +49,7 @@ module Encrypto
         value = double("value")
 
         some_box = double("box")
-        some_box.should_receive(:box).with(value, :hex)
+        some_box.should_receive(:box).with(value)
 
         box = Encrypto::Box.new(some_box)
         box.box(value)
@@ -59,9 +59,10 @@ module Encrypto
     describe "#open" do
       it "opens the cipher text" do
         cipher_text = double("cipher text")
+        cipher_text.stub(:clone => cipher_text)
 
         some_box = double("box")
-        some_box.should_receive(:open).with(cipher_text, :hex)
+        some_box.should_receive(:open).with(cipher_text)
 
         box = Encrypto::Box.new(some_box)
         box.open(cipher_text)

data/spec/encrypto/encrypto_spec.rb

@@ -54,17 +54,12 @@ module Encrypto
     describe '.encrypt_with_keypair' do
       it 'boxes the value in a keypair box' do
         value = double("value")
-        public_key = double("public")
-        hex_public_key = double("hex_public_key")
+        public_key = double("public_key")
         signing_private_key = double("signing_private_key")
         box = double("box")
 
-        Encrypto::Keys.should_receive(:hex_public_key).
-             with(public_key).
-             and_return(hex_public_key)
-
         Encrypto::Box.should_receive(:from_keypair).
-                    with(hex_public_key, signing_private_key).
+                    with(public_key, signing_private_key).
                     and_return(box)
 
         box.should_receive(:box).
@@ -76,33 +71,23 @@ module Encrypto
 
     describe ".decrypt_with_keypair" do
       let(:cipher_text)    { double("cipher text") }
-      let(:hex_public_key) { double("hex public key") }
       let(:public_key)     { double("public key") }
       let(:private_key)    { double("private key") }
 
-      it "creates a public key" do
-        Encrypto::Keys.should_receive(:hex_public_key).with(hex_public_key)
-        Encrypto::Box.stub(from_keypair: double(open: nil))
-
-        subject.decrypt_with_keypair(cipher_text, hex_public_key, private_key)
-      end
-
       it "decrypts the cipher text with the keypair"  do
         box = double
 
-        Encrypto::Keys.stub(hex_public_key: public_key)
         Encrypto::Box.should_receive(:from_keypair).with(public_key, private_key).and_return(box)
         box.should_receive(:open).with(cipher_text)
 
-        subject.decrypt_with_keypair(cipher_text, hex_public_key, private_key)
+        subject.decrypt_with_keypair(cipher_text, public_key, private_key)
       end
 
       it "returns the decrypted cipher text" do
         box = double(open: "decrypted value")
-        Encrypto::Keys.stub(hex_public_key: public_key)
         Encrypto::Box.stub(from_keypair: box)
 
-        subject.decrypt_with_keypair(cipher_text, hex_public_key, private_key).should eql "decrypted value"
+        subject.decrypt_with_keypair(cipher_text, public_key, private_key).should eql "decrypted value"
       end
     end
   end

data/spec/encrypto/keys_spec.rb

@@ -5,10 +5,10 @@ module Encrypto
 
     describe ".generate_keypair" do
       it "generates a keypair" do
-        public_key = double("public_key", :to_s => "hex public key")
+        public_key = double("public_key")
         private_key = double("private key", :public_key => public_key)
-        Crypto::PrivateKey.should_receive(:generate).and_return(private_key)
-        Encrypto::Keys.generate_keypair.should eql ["hex public key", private_key]
+        RbNaCl::PrivateKey.should_receive(:generate).and_return(private_key)
+        Encrypto::Keys.generate_keypair.should eql [public_key, private_key]
       end
     end
 

data/spec/encrypto/random_spec.rb

@@ -6,7 +6,7 @@ module Encrypto
   describe ".bytes" do
     it "creates a random byte sequence" do
       random_bytes = "asf2020fasd"
-      Crypto::Random.should_receive(:random_bytes).and_return(random_bytes)
+      RbNaCl::Random.should_receive(:random_bytes).and_return(random_bytes)
       Encrypto::Random.bytes.should eql random_bytes
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encrypto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,18 +14,18 @@ date: 2013-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl
-  requirement: &70128989961020 !ruby/object:Gem::Requirement
+  requirement: &70098716360120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70128989961020
+  version_requirements: *70098716360120
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
-  requirement: &70128989960500 !ruby/object:Gem::Requirement
+  requirement: &70098716359360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70128989960500
+  version_requirements: *70098716359360
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70128989959820 !ruby/object:Gem::Requirement
+  requirement: &70098716358900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *70128989959820
+  version_requirements: *70098716358900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128989959120 !ruby/object:Gem::Requirement
+  requirement: &70098716358440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *70128989959120
+  version_requirements: *70098716358440
 - !ruby/object:Gem::Dependency
   name: spec_coverage
-  requirement: &70128989958440 !ruby/object:Gem::Requirement
+  requirement: &70098716357960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +66,7 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *70128989958440
+  version_requirements: *70098716357960
 description: A gem that supports encrypting personal data by using rbnacl and attr_encrypted
 email: service@finalist.nl
 executables: []
@@ -89,7 +89,6 @@ files:
 - lib/encrypto/version.rb
 - script/bundler
 - script/ci
-- script/install_libsodium
 - spec/encrypto/box_spec.rb
 - spec/encrypto/database/encryptor_spec.rb
 - spec/encrypto/encrypto_spec.rb

data/script/install_libsodium

@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ ! -f /usr/local/lib/libsodium.a ];
-then
-  curl -o /tmp/sodium.tar.gz https://download.libsodium.org/libsodium/releases/old/libsodium-0.2.tar.gz
-  cd /tmp
-  tar vfzx sodium.tar.gz
-  cd libsodium-0.2
-  ./configure
-  make && make check && make install
-fi