diff options
| author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-13 13:01:23 +0000 |
|---|---|---|
| committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-13 13:01:23 +0000 |
| commit | 3207af4cb841872176ad0ba5cc62f868b83ee769 (patch) | |
| tree | f3f6b5428711fc2d9101f66f506538f20fede6be | |
| parent | 92300037ad5f8817bd364594d3d5bc55e3190ae7 (diff) | |
lib/securerandom.rb: fix errors on Windows
* lib/securerandom.rb (SecureRandom.random_bytes):
Use 64bit value as pointer for Windows x64 to fix SystemCallError.
* lib/securerandom.rb (SecureRandom.lastWin32ErrorMessage):
Set proper encoding to avoid invalid byte sequence error.
[ruby-core:47451] [Bug #6990]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/securerandom.rb | 9 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,12 @@ +Thu Sep 13 21:40:49 2012 Hiroshi Shirosaki <[email protected]> + + * lib/securerandom.rb (SecureRandom.random_bytes): + Use 64bit value as pointer for Windows x64 to fix SystemCallError. + + * lib/securerandom.rb (SecureRandom.lastWin32ErrorMessage): + Set proper encoding to avoid invalid byte sequence error. + [ruby-core:47451] [Bug #6990] + Thu Sep 13 11:20:00 2012 Zachary Scott <[email protected]> * lib/optparse.rb: Remove unreachable email address from documentation diff --git a/lib/securerandom.rb b/lib/securerandom.rb index 99e54db1dd..15fe86f444 100644 --- a/lib/securerandom.rb +++ b/lib/securerandom.rb @@ -94,16 +94,17 @@ module SecureRandom require 'Win32API' crypt_acquire_context = Win32API.new("advapi32", "CryptAcquireContext", 'PPPII', 'L') - @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'LIP', 'L') + @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'VIP', 'L') - hProvStr = " " * 4 + hProvStr = " " * DL::SIZEOF_VOIDP prov_rsa_full = 1 crypt_verifycontext = 0xF0000000 if crypt_acquire_context.call(hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0 raise SystemCallError, "CryptAcquireContext failed: #{lastWin32ErrorMessage}" end - @hProv, = hProvStr.unpack('L') + type = DL::SIZEOF_VOIDP == DL::SIZEOF_LONG_LONG ? 'q' : 'l' + @hProv, = hProvStr.unpack(type) @has_win32 = true rescue LoadError @@ -260,6 +261,6 @@ module SecureRandom code = get_last_error.call msg = "\0" * 1024 len = format_message.call(format_message_ignore_inserts + format_message_from_system, 0, code, 0, msg, 1024, nil, nil, nil, nil, nil, nil, nil, nil) - msg[0, len].tr("\r", '').chomp + msg[0, len].force_encoding("filesystem").tr("\r", '').chomp end end |