crypt-tea 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.0 / 2009-04-06
+
+* BUGFIX
+
+  * ensure extra characters on the end of decrypted strings are removed
+  * Thanks to James Zhang for reporting this
+
+
 === 1.0.0 / 2008-04-02
 
 * 1 major enhancement

data/lib/crypt_tea/xxtea.rb

@@ -1,8 +1,23 @@
 module Crypt
   class XXTEA
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
     DELTA = 0x9E3779B9
 
+    def initialize(new_key)
+      @key = str_to_longs(new_key)
+
+      if @key.length > 4
+        raise 'Key is too long (no more than 16 chars)'
+
+      elsif @key.length == 0
+        raise 'Key cannot be empty'
+
+      elsif @key.length < 4
+        @key.length.upto(4) { |i| @key[i] = 0 }
+
+      end
+    end
+
     def self.str_to_longs(s, include_count = false)
       length = s.length
       ((4 - s.length % 4) & 3).times { s << "\0" } # Pad to a multiple of 4
@@ -11,76 +26,70 @@ module Crypt
       unpacked
     end
 
-    def self.longs_to_str(l, unpad = false)   # convert array of longs back to string
+    def str_to_longs(s, include_count = false)
+      self.class.str_to_longs s, include_count
+    end
+
+
+    ##
+    # convert array of longs back to string
+    def self.longs_to_str(l, count_included = false)
       s = l.pack('V*')
-      s = s.gsub(/[\000-\037]/,'') if unpad
+      s = s[0...(l[-1])] if count_included
       s
     end
 
+    def longs_to_str(l, count_included = false)
+      self.class.longs_to_str l, count_included
+    end
+
 
     def self.int32(n)
-      n -= 4294967296 while (n >= 2147483648)
-      n += 4294967296 while (n <= -2147483649)
+      n -= 4_294_967_296 while (n >= 2_147_483_648)
+      n += 4_294_967_296 while (n <= -2_147_483_648)
       n.to_i
     end
 
+    def int32(n)
+      self.class.int32 n
+    end
 
-    def initialize(new_key)
-      @key = self.class.str_to_longs(new_key, false)
-
-      if @key.length > 4
-        raise 'Key is too long (no more than 16 chars)'
-
-      elsif @key.length == 0
-        raise 'Key cannot be empty'
-
-      elsif @key.length < 4
-        @key.length.upto(4) { |i| @key[i] = 0 }
-
-      end
+    def mx(z, y, sum, p, e)
+      int32(
+        ((z >> 5 & 0x07FFFFFF) ^ (y << 2)) +
+        ((y >> 3 & 0x1FFFFFFF) ^ (z << 4))
+      ) ^ int32((sum ^ y) + (@key[(p & 3) ^ e] ^ z))
     end
 
     def encrypt(plaintext)
       return '' if plaintext.length == 0
 
-      v = self.class.str_to_longs(plaintext, true)
+      v = str_to_longs(plaintext, true)
       v[1] = 0 if v.length == 1
 
       n = v.length - 1
 
       z = v[n]
       y = v[0]
-      q = (6 + 52/ (n + 1)).floor
+      q = (6 + 52 / (n + 1)).floor
       sum = 0
       p = 0
 
       while(0 <= (q -= 1)) do
-        sum = self.class.int32(sum + DELTA)
+        sum = int32(sum + DELTA)
         e = sum >> 2 & 3
 
-        (0...n).each do |p|
+        n.times do |p|
           y = v[p + 1];
-          mx =
-            self.class.int32(
-              ((z >> 5 & 0x07FFFFFF) ^ y << 2) +
-              ((y >> 3 & 0x1FFFFFFF) ^ z << 4)
-            ) ^ self.class.int32((sum ^ y) + (@key[p & 3 ^ e] ^ z))
-
-          z = v[p] = self.class.int32(v[p] + mx)
+          z = v[p] = int32(v[p] + mx(z, y, sum, p, e))
         end
 
         p += 1
         y = v[0];
-        mx =
-          self.class.int32(
-            ((z >> 5 & 0x07FFFFFF) ^ y << 2) +
-            ((y >> 3 & 0x1FFFFFFF) ^ z << 4)
-          ) ^ self.class.int32((sum ^ y) + (@key[p & 3 ^ e] ^ z))
-
-        z = v[p] = self.class.int32(v[p] + mx)
+        z = v[p] = int32(v[p] + mx(z, y, sum, p, e))
       end
 
-      self.class.longs_to_str(v).unpack('a*').pack('m').delete("\n") # base64 encode it without newlines
+      longs_to_str(v).unpack('a*').pack('m').delete("\n") # base64 encode it without newlines
     end
 
     #
@@ -89,40 +98,28 @@ module Crypt
     def decrypt(ciphertext)
       return '' if ciphertext.length == 0
 
-      v = self.class.str_to_longs(ciphertext.unpack('m').pack("a*"))   # base64 decode and convert to array of 'longs'
+      v = str_to_longs(ciphertext.unpack('m').pack("a*"))   # base64 decode and convert to array of 'longs'
       n = v.length - 1
       z = v[n]
       y = v[0]
       q = (6 + 52 / (n + 1)).floor
-      sum = self.class.int32(q * DELTA)
+      sum = int32(q * DELTA)
       p = 0
 
       while (sum != 0) do
         e = sum >> 2 & 3
         n.downto(1) do |p|
           z = v[p - 1]
-          mx =
-            self.class.int32(
-              ((z >> 5 & 0x07FFFFFF) ^ y << 2) +
-              ((y >> 3 & 0x1FFFFFFF) ^ z << 4)
-            ) ^ self.class.int32((sum ^ y) + (@key[p & 3 ^ e] ^ z))
-
-          y = v[p] = self.class.int32(v[p] - mx)
+          y = v[p] = int32(v[p] - mx(z, y, sum, p, e))
         end
 
         p -= 1
         z = v[n]
-        mx =
-          self.class.int32(
-            ((z >> 5 & 0x07FFFFFF) ^ y << 2) +
-            ((y >> 3 & 0x1FFFFFFF) ^ z << 4)
-          ) ^ self.class.int32((sum ^ y) + (@key[p & 3 ^ e] ^ z))
-
-        y = v[0] = self.class.int32(v[0] - mx)
-        sum = self.class.int32(sum - DELTA)
+        y = v[0] = int32(v[0] - mx(z, y, sum, p, e))
+        sum = int32(sum - DELTA)
       end
 
-      self.class.longs_to_str(v, true)
+      longs_to_str(v, true)
     end
 
   end

data/test/test_xxtea.rb

@@ -5,15 +5,17 @@ require 'crypt_tea'
 
 class XXTEATest < Test::Unit::TestCase
   def setup
-    @key = Crypt::XXTEA.new 'testkey'
+    @key = Crypt::XXTEA.new 'abigfattestkey'
+    @plaintext = "Oh say can you see, by the dawn's early light"
+    @cyphertext = "V32cYZc5yLXepm9lxzr4kgGM/eSVurwV0yQWi4uFs0uB2UBlJ19ZRKKMkbMr7DLGc3n1XQ=="
   end
 
   def test_str_to_long
-    assert_equal [1953719668, 6778473], Crypt::XXTEA.str_to_longs('testing')
+    assert_equal [1953719668, 6778473, 7], Crypt::XXTEA.str_to_longs('testing', true)
   end
 
   def test_longs_to_str
-    assert_equal 'testing', Crypt::XXTEA.longs_to_str([1953719668, 6778473], true)
+    assert_equal 'testing', Crypt::XXTEA.longs_to_str([1953719668, 6778473, 7], true)
   end
 
   def test_key_length
@@ -22,10 +24,19 @@ class XXTEATest < Test::Unit::TestCase
   end
 
   def test_encrypt
-    assert_equal 'qYkeGc3ignEvPGM7RS06iQ==', @key.encrypt('plaintext')
+    assert_equal @cyphertext, @key.encrypt(@plaintext)
   end
 
   def test_decrypt
-    assert_equal 'plaintext', @key.decrypt('qYkeGc3ignEvPGM7RS06iQ==')
+    assert_equal @plaintext, @key.decrypt(@cyphertext)
+  end
+
+  def test_tiny_plaintext
+    assert_equal '1', @key.decrypt(@key.encrypt('1'))
+  end
+
+  def test_huge_plaintext
+    str = '1234567890' * 1_000
+    assert_equal str, @key.decrypt(@key.encrypt(str))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crypt-tea
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeff Smick
@@ -30,17 +30,18 @@ cert_chain:
   M6zkPH2hkWs=
   -----END CERTIFICATE-----
 
-date: 2008-04-14 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.11.0
     version: 
 description: An implementation of the Tiny Encryption Algorithm that's compatible with PHP's xxTEA
 email: 
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: crypt-tea
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An implementation of the Tiny Encryption Algorithm that's compatible with PHP's xxTEA