Skip to content

Commit

Permalink
Merge branch 'evilmarty-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
courtenay committed Feb 23, 2012
2 parents 494077e + 4b352f8 commit 30f3d65
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/openid/dh.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def DiffieHellman.strxor(s, t)
end end


if String.method_defined? :bytes if String.method_defined? :bytes
s.bytes.zip(t.bytes).map{|sb,tb| sb^tb}.pack('C*') s.bytes.to_a.zip(t.bytes.to_a).map{|sb,tb| sb^tb}.pack('C*')
else else
indices = 0...(s.length) indices = 0...(s.length)
chrs = indices.collect {|i| (s[i]^t[i]).chr} chrs = indices.collect {|i| (s[i]^t[i]).chr}
Expand Down

0 comments on commit 30f3d65

Please sign in to comment.