kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/securerandom.rb: use OpenSSL::BN for performance improvement.

Browse source 
* benchmark/bm_securerandom.rb: benchmark script.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2014-08-08 11:00:47 +00:00
parent d6f0bd2b84
commit 0a22f4c168
3 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Aug 8 01:53:37 2014 Masaki Matsushita <glass.saga@gmail.com>
* lib/securerandom.rb: use OpenSSL::BN for performance improvement.
* benchmark/bm_securerandom.rb: benchmark script.
Fri Aug 8 17:19:57 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Fri Aug 8 17:19:57 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/open-uri.rb: remove needless condition for old ruby version. * lib/open-uri.rb: remove needless condition for old ruby version.

5
benchmark/bm_securerandom.rb Normal file
View file

@ -0,0 +1,5 @@
require "securerandom"
20_0000.times do
SecureRandom.random_number(100)
end

34
lib/securerandom.rb
View file

@ -214,21 +214,29 @@ module SecureRandom
# #
def self.random_number(n=0) def self.random_number(n=0)
if 0 < n if 0 < n
hex = n.to_s(16) if defined? OpenSSL::BN
hex = '0' + hex if (hex.length & 1) == 1 OpenSSL::BN.rand_range(n).to_i
bin = [hex].pack("H*") else
mask = bin[0].ord hex = n.to_s(16)
mask |= mask >> 1 hex = '0' + hex if (hex.length & 1) == 1
mask |= mask >> 2 bin = [hex].pack("H*")
mask |= mask >> 4 mask = bin[0].ord
begin mask |= mask >> 1
rnd = SecureRandom.random_bytes(bin.length) mask |= mask >> 2
rnd[0] = (rnd[0].ord & mask).chr mask |= mask >> 4
end until rnd < bin begin
rnd.unpack("H*")[0].hex rnd = SecureRandom.random_bytes(bin.length)
rnd[0] = (rnd[0].ord & mask).chr
end until rnd < bin
rnd.unpack("H*")[0].hex
end
else else
# assumption: Float::MANT_DIG <= 64 # assumption: Float::MANT_DIG <= 64
i64 = SecureRandom.random_bytes(8).unpack("Q")[0] if defined? OpenSSL::BN
i64 = OpenSSL::BN.rand(64, -1).to_i
else
i64 = SecureRandom.random_bytes(8).unpack("Q")[0]
end
Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG) Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
end end
end end