crypto_laser 0.0.3 → 0.0.4

data/.idea/crypto_laser.iml

@@ -4,17 +4,14 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="aead (v1.6.1, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.1, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="macaddr (v1.6.1, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="pivotal_git_scripts (v1.1.4, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v2.12.0, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.12.1, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.12.0, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.12.0, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="systemu (v2.5.2, RVM: ruby-1.9.3-p194 [crypto_laser]) [gem]" level="application" />
   </component>
 </module>
 

data/Gemfile.lock

@@ -1,17 +1,12 @@
 PATH
   remote: .
   specs:
-    crypto_laser (0.0.3)
-      aead
+    crypto_laser (0.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aead (1.6.1)
-      macaddr (~> 1)
     diff-lcs (1.1.3)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
     pivotal_git_scripts (1.1.4)
     rake (10.0.2)
     rspec (2.12.0)
@@ -22,7 +17,6 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
-    systemu (2.5.2)
 
 PLATFORMS
   ruby

data/crypto_laser.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crypto_laser"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = %w(Goodsearch)
   s.email       = %w(dev@goodsearch.com)
   s.homepage    = "http://www.goodsearch.com"
@@ -14,8 +14,6 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
   s.required_ruby_version = '>= 1.8.7'
 
-  s.add_dependency 'aead'
-
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
 

data/lib/crypto_laser.rb

@@ -1,4 +1,4 @@
-require 'aead'
+require 'openssl'
 require 'base64'
 
 # Simple library for authenticated encryption.  Most of the work
@@ -17,36 +17,51 @@ require 'base64'
 class CryptoLaser
 
   def self.encrypt(key, plain_text)
+    enc_key = key[0...32]
+    mac_key = key[32...64]
+
     code = CryptoLaser.default_algorithm_code
-    mode   = AEAD::Cipher.new(CryptoLaser.algorithms[code])
-    cipher = mode.new(key)
-    nonce = CryptoLaser.generate_nonce
-    cipher_text = cipher.encrypt(nonce, code, plain_text)
-    Base64.strict_encode64(code + nonce + cipher_text).chomp
+
+    cipher = OpenSSL::Cipher.new(CryptoLaser.algorithms[code])
+    cipher.encrypt
+    cipher.key = enc_key
+    nonce = cipher.random_iv
+    cipher.iv = nonce
+    cipher_text = cipher.update(plain_text) + cipher.final
+
+    text_to_mac = code + nonce + cipher_text
+    mac = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), mac_key, text_to_mac)
+
+    Base64.strict_encode64(text_to_mac + mac).chomp
   end
 
   def self.decrypt(key, base64_cipher_text)
+    enc_key = key[0...32]
+    mac_key = key[32...64]
     cipher_text = Base64.decode64(base64_cipher_text)
+
     code = cipher_text[0,2]
     algorithm = CryptoLaser.algorithms[code]
     raise "Invalid algorithm code." unless algorithm
-    mode = AEAD::Cipher.new(algorithm)
-    cipher = mode.new(key)
-    nonce = cipher_text[2...18] # TODO: Base on code
-    ctext = cipher_text[18..-1]
-    cipher.decrypt(nonce, code, ctext)
+
+    text_to_mac = cipher_text[0...-32]
+    mac = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), mac_key, text_to_mac)
+    raise "MAC check failed" unless mac == cipher_text[-32..-1]
+
+    decipher = OpenSSL::Cipher.new(CryptoLaser.algorithms[code])
+    decipher.decrypt
+    decipher.key = enc_key
+    decipher.iv = cipher_text[2...18]
+
+    decipher.update(cipher_text[18...-32]) +  decipher.final
   end
 
   def self.algorithms
-    { "V1" => 'AES-256-CBC-HMAC-SHA-256' }
+    { "V1" => 'AES-256-CBC' }
   end
 
   def self.default_algorithm_code
     "V1"
   end
 
-  def self.generate_nonce
-    SecureRandom.random_bytes(16)
-  end
-
 end

data/spec/lib/crypto_laser_spec.rb

@@ -1,24 +1,23 @@
 require 'spec_helper'
-
 require 'crypto_laser'
 
 describe CryptoLaser do
 
   let(:key) { "\"/\\xE0x5\\x9A\\xE9\\x82\\xB8p \\xED^\\xFFX\\xF6\\xB3}\\xB9bR\\xCF\\xDAdH\\xE4\\x9D\\xB5\\xC2r\\x98\\xD3\\xFC\"" }
   let(:nonce) { "\x97\x88\xF3\x0Ei\x84\x99\xC7 OZ2\xCA\v\x873" }
-  let(:cipher_text) { "VjGXiPMOaYSZxyBPWjLKC4czENVqZt2Eyj9+h+58kte4cpck4HhanqaFCaSEZL0K2E1WVVn1gPl+at0XAiYj3jd0" }
+  let(:cipher_text) { "VjGXiPMOaYSZxyBPWjLKC4czENVqZt2Eyj9+h+58kte4co0qArWC6f0+tYBGaC5rdU+R5fcmzLlFtD9j4eJiJWZN" }
   let(:plain_text) { "ZOMG PONIES" }
 
   describe "#encrypt" do
 
-    before { described_class.stub(:generate_nonce).and_return nonce }
+    before { OpenSSL::Cipher.any_instance.stub(:random_iv).and_return nonce }
 
     subject { described_class.encrypt(key, plain_text) }
 
-    it "encrypts plaintext" do
-      puts "#{__FILE__}:#{__LINE__} #{key.bytesize}"
+    it "encrypts plain text" do
       subject.should == cipher_text
     end
+
   end
 
   describe "#decrypt" do
@@ -47,13 +46,4 @@ describe CryptoLaser do
 
   end
 
-  describe ".generate_nonce" do
-
-    subject { described_class.generate_nonce }
-
-    it "should return 16 bytes" do
-      subject.bytesize.should == 16
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crypto_laser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aead
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement