diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/securerandom.rb | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Jan 29 13:16:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/securerandom.rb (SecureRandom.uuid): uses unpacked array + instead of string, because String#[] returns one length string. + Thu Jan 29 12:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rake.rb (FileUtils#rake_system): no longer needs workaround diff --git a/lib/securerandom.rb b/lib/securerandom.rb index 0582cee722..e317c4c459 100644 --- a/lib/securerandom.rb +++ b/lib/securerandom.rb @@ -169,11 +169,9 @@ module SecureRandom # SecureRandom.uuid generates a v4 random UUID. def self.uuid - str = self.random_bytes(16) - str[6] = (str[6] & 0x0f) | 0x40 - str[8] = (str[8] & 0x3f) | 0x80 - - ary = str.unpack("NnnnnN") + ary = self.random_bytes(16).unpack("NnnnnN") + ary[2] = (ary[2] & 0x0fff) | 0x4000 + ary[3] = (ary[3] & 0x3fff) | 0x8000 "%08x-%04x-%04x-%04x-%04x%08x" % ary end |