From f10e2af1e68392fff2e22e1f577ad2fb828f2d75 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 29 Jan 2009 04:16:17 +0000 Subject: * lib/securerandom.rb (SecureRandom.uuid): uses unpacked array instead of string, because String#[] returns one length string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/securerandom.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/securerandom.rb') 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 -- cgit v1.2.3