gibberish 1.2.0 → 1.2.1

data/CHANGELOG.mdown

@@ -1,3 +1,7 @@
+### v1.2.1
+* Added support for an optional salt - PR mdp/gibberish#9
+* Adding gem signing
+
 ### v1.2.0
 * Added digest support for SHA224/384 and HMAC SHA224/384/512. [Pull request #5](https://github.com/mdp/gibberish/pull/5)
 

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2012 Mark Percival <m@mdp.im>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/gem-public_cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDHjCCAgagAwIBAgIBADANBgkqhkiG9w0BAQUFADA1MQowCAYDVQQDDAFtMRMw
+EQYKCZImiZPyLGQBGRYDbWRwMRIwEAYKCZImiZPyLGQBGRYCaW0wHhcNMTMwMjEx
+MTYwNjAxWhcNMTQwMjExMTYwNjAxWjA1MQowCAYDVQQDDAFtMRMwEQYKCZImiZPy
+LGQBGRYDbWRwMRIwEAYKCZImiZPyLGQBGRYCaW0wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCsyb70vRSb3hfN5Go04jz84/XRf68uJD9NeNyE0y+lylOY
+jWEMaLu9TE2kYKOAvyZ/9+ioK19P+se1jCTIM+PZ11bz4Wmgk23XqmuSjA6v1dEA
+rlmsudYmlW36VviSIdTN3rvwoSiB+XXiUujF97nhvjxBpxnc1hJkxRz4KYwjjUPd
+NiGxK2GULOVwEEk5BScIG+FFJd/NKHF8tkxiiZNyjZDIwTvqMhYpnr/VRX+EsCkr
+A9j1a1GRyAHSUtxWuqjpWaXff2CEg5JavLZk1P74Zxx0c+rpsvY+bD0w9bMyNdgu
+jxxRo0Ompt3sCfpPwdp1hTBHJycrsdfH9rscQ7SPAgMBAAGjOTA3MAkGA1UdEwQC
+MAAwHQYDVR0OBBYEFLqZ2ITNwA6y/W8sBBWIUECnr5KjMAsGA1UdDwQEAwIEsDAN
+BgkqhkiG9w0BAQUFAAOCAQEAWRYRvVRJadDNC5zUEakTzrxb45Ket7dkTn8ejvHK
+nYtr9rjtreDjUrXSrQ9rThIMvcmMixyflSF93n5cqWYPFkU0V0p7s8K6b0vmRk6d
+iALE8XKqQKqzQSxk4r9FZeM/hk1FC2WBwjuNEy5tcpLF4KERVJzYq54mIyWDUV5c
+VJKW8u5/Wu2D4LNNIkwkhh2ULYOA6UBVwMrjp0ZHpV7jrt8SIyl1c7ONhnY0Pxey
+mxtia3OcUaHjfnuLeQqK7YpQCM2f/8sur+kpDjXH0DYTjmlOvZ07JI0Isd7zobrL
+2NEhdVRiMlG7L/ncFwqpHzWFY0r37QIQ9UwO5+t6lC9Cfg==
+-----END CERTIFICATE-----

data/gibberish.gemspec

@@ -14,6 +14,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "gibberish"
 
+  # Gem Signing
+  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  s.cert_chain = ["gem-public_cert.pem"]
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/gibberish/aes.rb

@@ -38,7 +38,7 @@ module Gibberish
     end
 
     def encrypt(data, opts={})
-      salt = generate_salt
+      salt = generate_salt(opts[:salt])
       setup_cipher(:encrypt, salt)
       e = cipher.update(data) + cipher.final
       e = "Salted__#{salt}#{e}" #OpenSSL compatible
@@ -59,7 +59,10 @@ module Gibberish
 
     private
 
-    def generate_salt
+    def generate_salt(supplied_salt)
+      if supplied_salt
+        return supplied_salt.to_s[0,8].ljust(8,'.')
+      end
       s = ''
       8.times {s << rand(255).chr}
       s

data/lib/gibberish/version.rb

@@ -1,3 +1,3 @@
 module Gibberish
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/aes_spec.rb

@@ -13,10 +13,53 @@ describe "the aes cipher" do
     from_openssl.must_equal(secret_text)
   end
 
+  it "when salt is not specified, encrypted text from repeated calls should not be the same" do
+    secret_text = "Made with Gibberish"
+    encrypted1 = @cipher.e(secret_text)
+    encrypted2 = @cipher.e(secret_text)
+    encrypted1.wont_equal(encrypted2)
+  end
+
+  it "when salt is specified, encrypted text from repeated calls (with same salt) be the same" do
+    secret_text = "Made with Gibberish"
+    salt = 'NaClNaCl'
+    encrypted1 = @cipher.e(secret_text, {:salt => salt})
+    encrypted2 = @cipher.e(secret_text, {:salt => salt})
+    encrypted1.must_equal(encrypted2)
+  end
+
+  it "when supplied salt is too long, text should still encrypt/decrypt correctly" do
+    secret_text = "Made with Gibberish"
+    salt = 'NaClNaClNaClNaClNaClNaClNaClNaClNaClNaCl'
+    encrypted1 = @cipher.e(secret_text, {:salt => salt})
+    @cipher.d(encrypted1).must_equal(secret_text)
+  end
+
+  it "when supplied salt is too short, text should still encrypt/decrypt correctly" do
+    secret_text = "Made with Gibberish"
+    salt = 'NaCl'
+    encrypted1 = @cipher.e(secret_text, {:salt => salt})
+    @cipher.d(encrypted1).must_equal(secret_text)
+  end
+
+  it "when number is supplied for salt, text should still encrypt/decrypt correctly" do
+    secret_text = "Made with Gibberish"
+    salt = 42
+    encrypted1 = @cipher.e(secret_text, {:salt => salt})
+    @cipher.d(encrypted1).must_equal(secret_text)
+  end
+
+  it "when idiotic value is supplied for salt, text should still encrypt/decrypt correctly" do
+    secret_text = "Made with Gibberish"
+    salt = {:whoknew => "I'm an idiot"}
+    encrypted1 = @cipher.e(secret_text, {:salt => salt})
+    @cipher.d(encrypted1).must_equal(secret_text)
+  end
+
   it "should decrypt base64 encoded data from the OpenSSL CLI" do
     secret_text = "Made with Gibberish"
     from_openssl = `echo #{secret_text} | openssl enc -aes-256-cbc -a -k password`
-    decrypted_text = @cipher.d(from_openssl).chomp
+      decrypted_text = @cipher.d(from_openssl).chomp
     decrypted_text.must_equal(secret_text)
   end
 

metadata

@@ -1,34 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gibberish
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Mark Percival
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain:
+- ! '-----BEGIN CERTIFICATE-----
 
-date: 2011-12-09 00:00:00 -08:00
-default_executable: 
-dependencies: []
+  MIIDHjCCAgagAwIBAgIBADANBgkqhkiG9w0BAQUFADA1MQowCAYDVQQDDAFtMRMw
+
+  EQYKCZImiZPyLGQBGRYDbWRwMRIwEAYKCZImiZPyLGQBGRYCaW0wHhcNMTMwMjEx
+
+  MTYwNjAxWhcNMTQwMjExMTYwNjAxWjA1MQowCAYDVQQDDAFtMRMwEQYKCZImiZPy
+
+  LGQBGRYDbWRwMRIwEAYKCZImiZPyLGQBGRYCaW0wggEiMA0GCSqGSIb3DQEBAQUA
+
+  A4IBDwAwggEKAoIBAQCsyb70vRSb3hfN5Go04jz84/XRf68uJD9NeNyE0y+lylOY
+
+  jWEMaLu9TE2kYKOAvyZ/9+ioK19P+se1jCTIM+PZ11bz4Wmgk23XqmuSjA6v1dEA
+
+  rlmsudYmlW36VviSIdTN3rvwoSiB+XXiUujF97nhvjxBpxnc1hJkxRz4KYwjjUPd
+
+  NiGxK2GULOVwEEk5BScIG+FFJd/NKHF8tkxiiZNyjZDIwTvqMhYpnr/VRX+EsCkr
+
+  A9j1a1GRyAHSUtxWuqjpWaXff2CEg5JavLZk1P74Zxx0c+rpsvY+bD0w9bMyNdgu
+
+  jxxRo0Ompt3sCfpPwdp1hTBHJycrsdfH9rscQ7SPAgMBAAGjOTA3MAkGA1UdEwQC
+
+  MAAwHQYDVR0OBBYEFLqZ2ITNwA6y/W8sBBWIUECnr5KjMAsGA1UdDwQEAwIEsDAN
+
+  BgkqhkiG9w0BAQUFAAOCAQEAWRYRvVRJadDNC5zUEakTzrxb45Ket7dkTn8ejvHK
+
+  nYtr9rjtreDjUrXSrQ9rThIMvcmMixyflSF93n5cqWYPFkU0V0p7s8K6b0vmRk6d
+
+  iALE8XKqQKqzQSxk4r9FZeM/hk1FC2WBwjuNEy5tcpLF4KERVJzYq54mIyWDUV5c
+
+  VJKW8u5/Wu2D4LNNIkwkhh2ULYOA6UBVwMrjp0ZHpV7jrt8SIyl1c7ONhnY0Pxey
+
+  mxtia3OcUaHjfnuLeQqK7YpQCM2f/8sur+kpDjXH0DYTjmlOvZ07JI0Isd7zobrL
+
+  2NEhdVRiMlG7L/ncFwqpHzWFY0r37QIQ9UwO5+t6lC9Cfg==
 
+  -----END CERTIFICATE-----
+
+'
+date: 2013-02-11 00:00:00.000000000 Z
+dependencies: []
 description: Supports OpenSSL compatible AES, HMAC, and RSA encryption
-email: 
+email:
 - mark@markpercival.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - .yardoc/checksums
@@ -37,8 +65,10 @@ files:
 - .yardopts
 - CHANGELOG.mdown
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
+- gem-public_cert.pem
 - gibberish.gemspec
 - lib/gibberish.rb
 - lib/gibberish/aes.rb
@@ -55,47 +85,28 @@ files:
 - spec/openssl/public.pem
 - spec/rsa_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/mdp/gibberish
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gibberish
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An opinionated ruby encryption library
-test_files: 
-- spec/aes_spec.rb
-- spec/digest_spec.rb
-- spec/hmac_spec.rb
-- spec/openssl/plaintext.crypted
-- spec/openssl/plaintext.txt
-- spec/openssl/private.pem
-- spec/openssl/public.pem
-- spec/rsa_spec.rb
-- spec/spec_helper.rb
+test_files: []

metadata.gz.sig

@@ -0,0 +1,2 @@
+�����k֋缺����4:����[��@��9���[��9g�{�;�g���e�J/T�P��6P��OBt��X�ɧk���� }���䐂$�֬l��9e�f��%V<�a���e��=!�`t����4�W����K�R�����|J�`�1M����!�D��#��%3�ʏZ���_�R�8�e��>b`>/�kfa��4L��Y��Ws��64��:�ʉ��
+I�#y+$�DUzSF��C�C����7��O