encrypt 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b19235367f67525fa9762a3d8ac24412940681b
-  data.tar.gz: c81a93aea5d4df6915691473be8cb0234bed2cb2
+  metadata.gz: 2ec8280c8a6ae60580cd5283a0156bbced5d56b7
+  data.tar.gz: e774ff6e6838bff3bd49e228aeb14adc21f594ea
 SHA512:
-  metadata.gz: 18c67e2f85158fab8883c90191a0dd01e8ba9052906c66dc45e49c41e521e1877088de91b6da607f747893141bce8938c152a516394d8774d20319f0e8cf882f
-  data.tar.gz: 1d58c450b06c03e55a9ab06d9423f9fd0bce76a0ccf43593f4f1ce9915e3513a275dbe737301ada17c06af83f7a3d670b5c9f26094076fc284e0719fbeaecb5f
+  metadata.gz: f08646430895d8ce7f4f7a3690c456b83f3e3f2ee49155d7a1922713a12d71bfddd7aebcb8b945946be8da2dbc2d4981f52bdd3041d91f7bbdc3147a9cdea382
+  data.tar.gz: 30a5dee8f3f1239ce0bf604604c1849dfd0fe0a5fbb8712cc8047dbc48482c9902c47a54ebcdb03dc2045ba26e10797dfeb36bd4fa2bbffa74be58ed5aaec842

data/README.md

@@ -2,7 +2,7 @@
 
 A gem for encrypting and decrypting strings with AES-256. Just supply the password.
 
-Encrypt uses an AES-256 cipher in CTR mode. A randomly generated salt and IV are publicly stored as the 32 bytes preceding the encrypted data.
+Encrypt uses an AES-256 cipher in CTR mode. A randomly generated salt and IV are publicly stored along with the encrypted data.
 
 Encrypt makes use of Ruby 2.0's experimental refinements to extend String locally, adding the #encrypt and #decrypt methods. Activate the refinement with using: `using Encrypt`.
 
@@ -14,7 +14,7 @@ require 'encrypt'
 using Encrypt
 
 encrypted = 'super sekret'.encrypt 'passw0rd'
-  #=> "\x13\xC4\x18\xE4\x1E.^HU0\rOZs\xFE7@\xC0\xB3\xB6\x9F\"\xE6M\xA6\xF4\xC4a\x85\x89\xECtW\xF9\x9DN\xA1_6\x8Bd\x0F\x19b"
+  #=> "\x04\b[\b\"\x15H\xEB\x8C\xE6\xA2r\xDA\x15\xDDH\xEB\xF2|\x11\xEFF\"\x15\xE9\xBB\xB1\xCEO\xB6Y\x19zk\xDD\xD5\x9A\xBD\x01\xF5\"\x11F/1\x1D;2g\xFC\xB8np\xBC"
 
 encrypted.decrypt 'passw0rd'
   #=> "super sekret"
@@ -28,9 +28,12 @@ encrypted.decrypt 'passw0rd'
 
 Ruby 2.0.0+ (uses [experimental refinements](http://www.ruby-doc.org/core-2.0/doc/syntax/refinements_rdoc.html))
 
+## Alternatives
+The [RbNACL](https://github.com/cryptosphere/rbnacl#readme) gem has been more thoroughly vetted and is a recommended alternative.
+
 ## Contributing
 
 1. Fork it
 2. Commit changes
 3. Submit a Pull Request
-4.  :cake:
+4.  :pineapple:

data/lib/encrypt.rb

@@ -5,20 +5,19 @@ module Encrypt
     def encrypt key
       cipher = OpenSSL::Cipher::AES256.new(:CTR)
       cipher.encrypt
-      iv = cipher.random_iv
       salt = OpenSSL::Random.random_bytes(16)
       cipher.key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(key, salt, 20000, 32)
-      salt << iv << cipher.update(self) << cipher.final
+      iv = cipher.random_iv
+      Marshal.dump([salt, iv, cipher.update(self) << cipher.final])
     end
 
     def decrypt key
-      return nil unless self.bytesize > 32
+      salt, iv, encrypted = Marshal.load(self)
       cipher = OpenSSL::Cipher::AES256.new(:CTR)
       cipher.decrypt
-      salt = self.byteslice(0..15)
       cipher.key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(key, salt, 20000, 32)
-      cipher.iv = self.byteslice(16..31)
-      cipher.update(self.byteslice(32..-1)) << cipher.final
+      cipher.iv = iv
+      cipher.update(encrypted) << cipher.final
     end
   end
 end

data/lib/encrypt/version.rb

@@ -1,3 +1,3 @@
 module Encrypt
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/encrypt_test.rb

@@ -10,7 +10,11 @@ describe Encrypt do
   end
 
   it 'encrypts' do
-    @encrypted.bytes.count == 38
+    assert @encrypted != 'sekret'
+  end
+  
+  it 'does not decrypt with incorrect key' do
+    refute_equal 'sekret', @encrypted.decrypt('password')
   end
 
   it 'decrypts' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Shannon Skipper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: 'Encrypt and decrypt strings with AES-256 in CTR mode. Encrypt uses Ruby