encrypted_strings 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.3.2 / 2009-01-11
+
+* Use Array#pack/String#unpack instead of Base64 to be compatible with Ruby 1.9+
+
 == 0.3.1 / 2008-12-4
 
 * Fix symmetric ciphers not working on Ruby 1.8.6 and below

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'encrypted_strings'
-  s.version           = '0.3.1'
+  s.version           = '0.3.2'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Dead-simple string encryption/decryption syntax.'
   

data/lib/encrypted_strings.rb

@@ -1,3 +1,5 @@
+require 'openssl'
+
 require 'encrypted_strings/extensions/string'
 require 'encrypted_strings/cipher'
 require 'encrypted_strings/symmetric_cipher'

data/lib/encrypted_strings/asymmetric_cipher.rb

@@ -76,10 +76,10 @@ module EncryptedStrings
     # Creates a new cipher that uses an asymmetric encryption strategy.
     # 
     # Configuration options:
-    # * +private_key_file+ - Encrypted private key file
-    # * +public_key_file+ - Public key file
-    # * +password+ - The password to use in the symmetric cipher
-    # * +algorithm+ - Algorithm to use symmetrically encrypted strings
+    # * <tt>:private_key_file</tt> - Encrypted private key file
+    # * <tt>:public_key_file</tt> - Public key file
+    # * <tt>:password</tt> - The password to use in the symmetric cipher
+    # * <tt>:algorithm</tt> - Algorithm to use symmetrically encrypted strings
     def initialize(options = {})
       invalid_options = options.keys - [:private_key_file, :public_key_file, :algorithm, :password]
       raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
@@ -107,7 +107,7 @@ module EncryptedStrings
       raise NoPublicKeyError, "Public key file: #{public_key_file}" unless public?
       
       encrypted_data = public_rsa.public_encrypt(data)
-      Base64.encode64(encrypted_data)
+      [encrypted_data].pack('m')
     end
     
     # Decrypts the given data. If no private key file has been specified, then
@@ -115,7 +115,7 @@ module EncryptedStrings
     def decrypt(data)
       raise NoPrivateKeyError, "Private key file: #{private_key_file}" unless private?
       
-      decrypted_data = Base64.decode64(data)
+      decrypted_data = data.unpack('m')[0]
       private_rsa.private_decrypt(decrypted_data)
     end
     

data/lib/encrypted_strings/extensions/string.rb

@@ -1,6 +1,3 @@
-require 'openssl'
-require 'base64'
-
 module EncryptedStrings
   module Extensions #:nodoc:
     # Adds support for in-place encryption/decryption of strings

data/lib/encrypted_strings/sha_cipher.rb

@@ -41,7 +41,8 @@ module EncryptedStrings
     # Creates a new cipher that uses an SHA encryption strategy.
     # 
     # Configuration options:
-    # * +salt+ - Random bytes used as one of the inputs for generating the encrypted string
+    # * <tt>:salt</tt> - Random bytes used as one of the inputs for generating
+    #   the encrypted string
     def initialize(options = {})
       invalid_options = options.keys - [:salt]
       raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?

data/lib/encrypted_strings/symmetric_cipher.rb

@@ -60,8 +60,9 @@ module EncryptedStrings
     # Creates a new cipher that uses a symmetric encryption strategy.
     # 
     # Configuration options:
-    # * +algorithm+ - The algorithm to use for generating the encrypted string
-    # * +password+ - The secret value to use for generating the key/initialization vector for the algorithm
+    # * <tt>:algorithm</tt> - The algorithm to use for generating the encrypted string
+    # * <tt>:password</tt> - The secret value to use for generating the
+    #   key/initialization vector for the algorithm
     def initialize(options = {})
       invalid_options = options.keys - [:algorithm, :password]
       raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
@@ -81,13 +82,13 @@ module EncryptedStrings
     # Decrypts the current string using the current key and algorithm specified
     def decrypt(data)
       cipher = build_cipher(:decrypt)
-      cipher.update(Base64.decode64(data)) + cipher.final
+      cipher.update(data.unpack('m')[0]) + cipher.final
     end
     
     # Encrypts the current string using the current key and algorithm specified
     def encrypt(data)
       cipher = build_cipher(:encrypt)
-      Base64.encode64(cipher.update(data) + cipher.final)
+      [cipher.update(data) + cipher.final].pack('m')
     end
     
     private

data/test/sha_cipher_test.rb

@@ -72,10 +72,11 @@ class ShaCipherWithNonStringSaltTest < Test::Unit::TestCase
   require 'time'
   
   def setup
-    @sha_cipher = EncryptedStrings::ShaCipher.new(:salt => Time.parse('Tue Jan 01 00:00:00 UTC 2008'))
+    @time = Time.parse('Tue Jan 01 00:00:00 UTC 2008')
+    @sha_cipher = EncryptedStrings::ShaCipher.new(:salt => @time)
   end
   
   def test_should_stringify_salt
-    assert_equal 'Tue Jan 01 00:00:00 UTC 2008', @sha_cipher.salt
+    assert_equal @time.to_s, @sha_cipher.salt
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: encrypted_strings
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -05:00
+date: 2009-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: []