@@ -60,7 +60,7 @@ module Feistel S = [S1, S2, S3, S4, S5, S6, S7, S8] def self.run(r, k) - b = [] # b[0..7] is e_xor_k prepped as 8 6-bit arrays for sbox substitution. + b = [] # b[0..7] is e_xor_k prepped as 8 6-bit arrays for s-box substitution. m = [] # m[0..7] is the row of the value when performing a s-box lookup. n = [] # n[0..7] is the column of the value when performing a s-box lookup. @@ -75,8 +75,8 @@ module Feistel b[i] << e_xor_k.shift end - m << (b[i].first.to_s + b[i].last.to_s).to_i(2) * 16 # [1, 0, 1, 0, 1, 0] => [1, 0] => 2 => 32 => 3rd row. - n << b[i][1..4].to_s.to_i(2) # [1, 0, 1, 0, 1, 0] => [0, 1, 0, 1] => 5 => 6th column. + m << [b[i].first, b[i].last].join.to_i(2) * 16 # [1, 0, 1, 0, 1, 0] => [1, 0] => 2 => 32 => 3rd row. + n << b[i][1..4].join.to_i(2) # [1, 0, 1, 0, 1, 0] => [0, 1, 0, 1] => 5 => 6th column. end # Substitute every 6-bit array with the 4-bit array specified by the appropriate s-box. lib/ruby-des/feistel.rb 15060808bc6c30d2c5045a79e05d77555269ab7d Robert Sosinski email@robertsosinski.com http://github.com/robertsosinski/ruby-des/commit/4d38ec9fd112f4a16b38e3c3434fce6e06ed4bbf 4d38ec9fd112f4a16b38e3c3434fce6e06ed4bbf 2008-09-01T22:00:27-07:00 2008-09-01T22:00:27-07:00 cleaned up a few things 6af1900a137bb60004f5751a32e7103c576fe5b3 Robert Sosinski email@robertsosinski.com