1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/securerandom.rb: more refactoring.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-11-08 19:59:01 +00:00
parent b2247be993
commit 6999a86600
1 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
lib/securerandom.rb
View File

@ -39,37 +39,56 @@ end
# p SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301" # p SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301"
# p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337" # p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
module SecureRandom module SecureRandom
module AdvApi32 # :nodoc: if /mswin|mingw/ =~ RUBY_PLATFORM
require "fiddle/import" require "fiddle/import"
extend Fiddle::Importer
dlload "advapi32"
extern "int CryptAcquireContext(void*, void*, void*, unsigned long, unsigned long)"
extern "int CryptGenRandom(void*, unsigned long, void*)"
unless defined?(@hProv) module AdvApi32 # :nodoc:
hProvStr = " " * Fiddle::SIZEOF_VOIDP extend Fiddle::Importer
prov_rsa_full = 1 dlload "advapi32"
crypt_verifycontext = 0xF0000000 extern "int CryptAcquireContext(void*, void*, void*, unsigned long, unsigned long)"
extern "int CryptGenRandom(void*, unsigned long, void*)"
if CryptAcquireContext(hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0 def self.get_provider
raise SystemCallError, "CryptAcquireContext failed: #{lastWin32ErrorMessage}" hProvStr = " " * Fiddle::SIZEOF_VOIDP
prov_rsa_full = 1
crypt_verifycontext = 0xF0000000
if CryptAcquireContext(hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0
raise SystemCallError, "CryptAcquireContext failed: #{lastWin32ErrorMessage}"
end
type = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q' : 'l'
hProv, = hProvStr.unpack(type)
hProv
end
def self.gen_random(n)
@hProv ||= get_provider
bytes = " ".force_encoding("ASCII-8BIT") * n
if CryptGenRandom(@hProv, bytes.size, bytes) == 0
raise SystemCallError, "CryptGenRandom failed: #{Kernel32.last_error_message}"
end
bytes
end end
type = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q' : 'l'
@hProv, = hProvStr.unpack(type)
end end
def self.hProv module Kernel32 # :nodoc:
@hProv extend Fiddle::Importer
end dlload "kernel32"
end if /mswin|mingw/ =~ RUBY_PLATFORM extern "unsigned long GetLastError()"
extern "unsigned long FormatMessageA(unsigned long, void*, unsigned long, unsigned long, void*, unsigned long, void*)"
module Kernel32 # :nodoc: # Following code is based on David Garamond's GUID library for Ruby.
require "fiddle/import" def self.last_error_message
extend Fiddle::Importer format_message_ignore_inserts = 0x00000200
dlload "kernel32" format_message_from_system = 0x00001000
extern "unsigned long GetLastError()"
extern "unsigned long FormatMessageA(unsigned long, void*, unsigned long, unsigned long, void*, unsigned long, void*)" code = GetLastError()
end if /mswin|mingw/ =~ RUBY_PLATFORM msg = "\0" * 1024
len = FormatMessageA(format_message_ignore_inserts + format_message_from_system, 0, code, 0, msg, 1024, nil)
msg[0, len].force_encoding("filesystem").tr("\r", '').chomp
end
end
end
# SecureRandom.random_bytes generates a random binary string. # SecureRandom.random_bytes generates a random binary string.
# #
@ -122,11 +141,7 @@ module SecureRandom
end end
if defined?(AdvApi32) if defined?(AdvApi32)
bytes = " ".force_encoding("ASCII-8BIT") * n return AdvApi32.gen_random(n)
if AdvApi32.CryptGenRandom(AdvApi32.hProv, bytes.size, bytes) == 0
raise SystemCallError, "CryptGenRandom failed: #{lastWin32ErrorMessage}"
end
return bytes
end end
raise NotImplementedError, "No random device" raise NotImplementedError, "No random device"
@ -269,14 +284,8 @@ module SecureRandom
"%08x-%04x-%04x-%04x-%04x%08x" % ary "%08x-%04x-%04x-%04x-%04x%08x" % ary
end end
# Following code is based on David Garamond's GUID library for Ruby.
def self.lastWin32ErrorMessage # :nodoc: def self.lastWin32ErrorMessage # :nodoc:
format_message_ignore_inserts = 0x00000200 # for compatibility
format_message_from_system = 0x00001000 Kernel32.last_error_message
code = Kernel32.GetLastError()
msg = "\0" * 1024
len = Kernel32.FormatMessageA(format_message_ignore_inserts + format_message_from_system, 0, code, 0, msg, 1024, nil)
msg[0, len].force_encoding("filesystem").tr("\r", '').chomp
end end
end end