xxtea-ruby 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc56a30ea088303af96c80f4f36b5a809aa1bb0
-  data.tar.gz: d46a9ccdadb94859bbe668d477abcd0f9c92fccf
+  metadata.gz: 9919007b9f52cde6b5dcd6a848dcd0ae8a847349
+  data.tar.gz: 206f55dfabdf1ecd24ab28c176d00e9c8805d82c
 SHA512:
-  metadata.gz: 09c1d9fab2db59aa73713a8aabad63b9de3e992fa267a5be3659833a2fa4d0df7cc02f046ed54b0f4fe03e1c123f360a9f0e493655c5a97775ecfcb65f882d70
-  data.tar.gz: b7d99f7446473f63820ac0d667969e760070a445622c25b1c6f0bb4a8e556b1a63cb575399c67bf4bdebe4c5c5e0a2a567351226fff0847219970321c76cb4ea
+  metadata.gz: 899cdb9b8344f2adb94184725a1622ec3d43cb110fc969cde797e0b09b3a6f92c8f816d13927327c8026429927255a87494d95c2ca87c29b61373926a60ad0d5
+  data.tar.gz: cc963729812d91248e91f4c4eccf19475e7471d548b7c433510413e91a95ccf26824ba2cec7394159e6b24086a7f00cae33c6a19dba0737a506c0b4460bc3481

data/ext/xxtea/extconf.rb

@@ -9,7 +9,7 @@
 #      Roger M. Needham                                    #
 #                                                          #
 # Code Author: Ma Bingyao <mabingyao@gmail.com>            #
-# LastModified: Feb 12, 2016                               #
+# LastModified: Feb 13, 2016                               #
 #                                                          #
 ############################################################
 
@@ -21,7 +21,7 @@ else
     file.puts 'project(xxtea)'
     file.puts 'cmake_minimum_required(VERSION 2.6)'
     file.puts 'set(CMAKE_MACOSX_RPATH 1)' if RUBY_PLATFORM=~/darwin/
-    file.puts 'set(LIBXXTEA_SRC ' + File.expand_path(File.dirname(__FILE__) + '/xxtea.c') +')'
+    file.puts 'set(LIBXXTEA_SRC ' + File.expand_path(File.join(File.dirname(__FILE__), 'xxtea.c')) +')'
     file.puts 'add_library(xxtea SHARED ${LIBXXTEA_SRC})'
     file.puts 'set_target_properties(xxtea PROPERTIES PREFIX "")'
     file.puts 'set_target_properties(xxtea PROPERTIES SUFFIX "")'
@@ -32,7 +32,7 @@ else
     else
       file.puts 'set_target_properties(xxtea PROPERTIES OUTPUT_NAME "xxtea.so")'
     end
-    file.puts 'install(TARGETS xxtea DESTINATION ' + File.expand_path(File.dirname(__FILE__) + '/../../lib/xxtea') + ')'
+    file.puts 'install(TARGETS xxtea DESTINATION ' + File.expand_path(File.join(File.dirname(__FILE__), '../../lib/xxtea')) + ')'
   end
   system('cmake -G "Unix Makefiles" .')
 end

data/lib/xxtea.rb

@@ -9,11 +9,11 @@
 #      Roger M. Needham                                    #
 #                                                          #
 # Code Author: Ma Bingyao <mabingyao@gmail.com>            #
-# LastModified: Feb 12, 2016                               #
+# LastModified: Feb 13, 2016                               #
 #                                                          #
 ############################################################
 
-if File.exists?(File.dirname(__FILE__) + '/xxtea.' + (RUBY_PLATFORM=~/darwin/ ? 'dylib' : RUBY_PLATFORM=~/win32|w32/ ? 'dll' : 'so')) then
+if File.exists?(File.join(File.dirname(__FILE__), 'xxtea.' + (RUBY_PLATFORM=~/darwin/ ? 'dylib' : RUBY_PLATFORM=~/win32|w32/ ? 'dll' : 'so'))) then
   if !defined?(JRUBY_VERSION) then
     require "xxtea/xxtea"
   else
@@ -25,7 +25,7 @@ end
 
 module XXTEA
   extend self
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
   if RUBY_VERSION >= "1.9.0" then
     def decrypt_utf8(data, key)
       decrypt(data, key).force_encoding(Encoding::UTF_8)

data/lib/xxtea/xxtea_ffi.rb

@@ -9,7 +9,7 @@
 #      Roger M. Needham                                    #
 #                                                          #
 # Code Author: Ma Bingyao <mabingyao@gmail.com>            #
-# LastModified: Feb 12, 2016                               #
+# LastModified: Feb 13, 2016                               #
 #                                                          #
 ############################################################
 
@@ -29,7 +29,7 @@ module XXTEA
   private
   module LIB
     extend FFI::Library
-    ffi_lib File.dirname(__FILE__) + '/xxtea.' + (RUBY_PLATFORM=~/darwin/ ? 'dylib' : RUBY_PLATFORM=~/win32|w32/ ? 'dll' : 'so')
+    ffi_lib File.join(File.dirname(__FILE__), 'xxtea.' + (RUBY_PLATFORM=~/darwin/ ? 'dylib' : RUBY_PLATFORM=~/win32|w32/ ? 'dll' : 'so'))
     attach_function :xxtea_encrypt, [:pointer, :size_t, :pointer, :pointer], :pointer
     attach_function :xxtea_decrypt, [:pointer, :size_t, :pointer, :pointer], :pointer
     attach_function :free, [:pointer], :void

data/lib/xxtea/xxtea_ruby.rb

@@ -9,7 +9,7 @@
 #      Roger M. Needham                                    #
 #                                                          #
 # Code Author: Ma Bingyao <mabingyao@gmail.com>            #
-# LastModified: Feb 11, 2016                               #
+# LastModified: Feb 13, 2016                               #
 #                                                          #
 ############################################################
 module XXTEA
@@ -50,20 +50,24 @@ module XXTEA
     ((z >> 5 ^ y << 2) + (y >> 3 ^ z << 4)) ^ ((sum ^ y) + (k[p & 3 ^ e] ^ z))
   end
 
+  def int32(i)
+    i & 0xffffffff
+  end
+
   def encrypt_uint32_array(v, k)
     n = v.size - 1
     z = v[n]
     y = 0
     sum = 0
     (6 + 52 / (n + 1)).downto(1) {
-      sum = (sum + DELTA) & 0xffffffff
+      sum = int32(sum + DELTA)
       e = (sum >> 2) & 3
       for p in (0...n)
         y = v[p + 1]
-        z = v[p] = (v[p] + mx(sum, y, z, p, e, k)) & 0xffffffff
+        z = v[p] = int32(v[p] + mx(sum, y, z, p, e, k))
       end
       y = v[0]
-      z = v[n] = (v[n] + mx(sum, y, z, n, e, k)) & 0xffffffff
+      z = v[n] = int32(v[n] + mx(sum, y, z, n, e, k))
     }
     return v
   end
@@ -72,16 +76,16 @@ module XXTEA
     n = v.size - 1
     z = 0
     y = v[0]
-    sum = ((6 + 52 / (n + 1)) * DELTA) & 0xffffffff
+    sum = int32((6 + 52 / (n + 1)) * DELTA)
     while (sum != 0)
       e = sum >> 2 & 3
       n.downto(1) { |p|
         z = v[p - 1]
-        y = v[p] = (v[p] - mx(sum, y, z, p, e, k)) & 0xffffffff
+        y = v[p] = int32(v[p] - mx(sum, y, z, p, e, k))
       }
       z = v[n]
-      y = v[0] = (v[0] - mx(sum, y, z, 0, e, k)) & 0xffffffff
-      sum = (sum - DELTA) & 0xffffffff
+      y = v[0] = int32(v[0] - mx(sum, y, z, 0, e, k))
+      sum = int32(sum - DELTA)
     end
     return v
   end

data/xxtea-ruby.gemspec

@@ -1,6 +1,11 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'xxtea'
+
 Gem::Specification.new do |s|
   s.name         = 'xxtea-ruby'
-  s.version      = '1.3.0'
+  s.version      = XXTEA::VERSION
   s.license      = 'MIT'
   s.author       = 'Ma Bingyao ( andot )'
   s.email        = 'mabingyao@gmail.com'
@@ -16,7 +21,7 @@ EOF
   s.files        = `git ls-files`.split($/)
   s.test_files   = s.files.grep(%r{^test/})
   s.require_path = 'lib'
-  s.extensions   = ["ext/xxtea/extconf.rb"]
+  s.extensions   = ['ext/xxtea/extconf.rb']
 
   s.add_runtime_dependency 'ffi', '~> 1.9', '>= 1.9.10'
   s.requirements << 'cmake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xxtea-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ma Bingyao ( andot )
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi