twofish 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b2bbf43d9b32ff9b0e8eed4a21195deba38bd7
-  data.tar.gz: 6b23d440cb0cac34cbba9c37062ab51ce168b4f3
+  metadata.gz: 94fdd3f8675e917213219e3e7c20be6bb6ea7cca
+  data.tar.gz: e026a558a458513387b7b511a2b4c4334e04afac
 SHA512:
-  metadata.gz: f591af29855dce80ccd4f922f146a5ad7bb43cd1b3eba07826f34df0e3ebf605f680eeea7d690538cb5ca9c11e5473355040a103ec1e25d15e1387821309381e
-  data.tar.gz: 81a586774968b3511354de8979944949e55232d470cd033a2190fdf2b622a7524eefcd7e710fb4f0bc69d62fe503eb8b61980b14b048e1d4e0d74b6c240e6fc1
+  metadata.gz: 8b9c58fdc89dd9b7dce44500d617143fb7074b3f2f9297fd952643cabd2e97ed1e04b71f34c55bbdcec6375420604ec50516bdff23e2e6ee060aa68618652008
+  data.tar.gz: d3a0f83c9b58a7649942bbc5a007ea72af48cf38ff2a7194768775190a815104c0abc5a0f843b8c53a13fb487059585a7a5b611abd02048de6e299ae788d7642

data/lib/twofish.rb

@@ -9,7 +9,6 @@
 class Twofish
 
   require 'securerandom'
-  require 'string' # monkey patch for MRI 1.8.7
   require 'twofish/mode'
   require 'twofish/padding'
 
@@ -442,7 +441,7 @@ class Twofish
   # must be a multiple of the block size.
   def iv=(iv)
     raise ArgumentError, 'cannot specify initialization vector for ECB mode' if @mode == Mode::ECB
-    raise ArgumentError, "initialization vectcor is not a multiple of #{BLOCK_SIZE} bytes" unless (iv.length % BLOCK_SIZE).zero?
+    raise ArgumentError, "initialization vector is not a multiple of #{BLOCK_SIZE} bytes" unless (iv.length % BLOCK_SIZE).zero?
     @iv = iv
   end
 
@@ -471,9 +470,9 @@ class Twofish
   # Encrypt a plaintext string, chunking as required for
   # CBC mode.
   def encrypt(plaintext)
-    plaintext = plaintext.dup.force_encoding('ASCII-8BIT')
+    plaintext = to_binary(plaintext.dup)
     padded_plaintext = Padding.pad!(plaintext, BLOCK_SIZE, @padding)
-    result = ''.force_encoding('ASCII-8BIT')
+    result = to_binary('')
     if @mode == Mode::CBC
       @iv ||= SecureRandom.random_bytes(BLOCK_SIZE)
       @_feedback ||= @iv
@@ -490,9 +489,9 @@ class Twofish
   # chaining modes. If @iv is not set then we use the first block
   # as the initialization vector when chaining.
   def decrypt(ciphertext)
-    ciphertext = ciphertext.dup.force_encoding('ASCII-8BIT')
+    ciphertext = to_binary(ciphertext.dup)
     raise ArgumentError, "ciphertext is not a multiple of #{BLOCK_SIZE} bytes" unless (ciphertext.length % BLOCK_SIZE).zero?
-    result = ''.force_encoding('ASCII-8BIT')
+    result = to_binary('')
     if Mode::CBC == @mode
       if @iv
         @_feedback ||= @iv
@@ -1044,7 +1043,12 @@ class Twofish
     [@k[0] ^ r2, @k[1] ^ r3, @k[2] ^ r0, @k[3] ^ r1].pack("V4")
   end
 
-private
+  private
+
+  # Force String encoding to binary/8-bit ASCII. NB mutates argument.
+  def to_binary(s)
+    s.respond_to?(:force_encoding) ? s.force_encoding('BINARY') : s
+  end
 
   # The (12, 8) Reed Solomon code has the generator polynomial:
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twofish
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Martin Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Twofish symmetric cipher in pure Ruby with ECB and CBC cipher modes derived
   from an original Perl implementation by Guido Flohr
@@ -20,15 +20,14 @@ extra_rdoc_files:
 - Rakefile
 - README.rdoc
 files:
+- LICENSE
+- README.rdoc
+- Rakefile
 - lib/twofish.rb
 - lib/twofish/mode.rb
 - lib/twofish/padding.rb
-- lib/string.rb
 - test/benchmark.rb
 - test/test_twofish.rb
-- LICENSE
-- Rakefile
-- README.rdoc
 homepage: http://mcarpenter.org/projects/twofish
 licenses:
 - BSD
@@ -39,17 +38,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Twofish symmetric cipher in pure Ruby

data/lib/string.rb

@@ -1,16 +0,0 @@
-class String
-
-  unless method_defined?(:byteslice)
-    def byteslice(*args)
-      self.dup.force_encoding('ASCII-8BIT').slice!(*args)
-    end
-  end
-
-  unless method_defined?(:force_encoding)
-    def force_encoding(encoding)
-      self # noop
-    end
-  end
-
-end
-