Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Side by Side Diff: Source/core/platform/UUID.cpp

Issue 14178012: Remove the USE(OS_RANDOMNESS) guard. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/page/Crypto.cpp ('k') | Source/wtf/CryptographicallyRandomNumber.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "UUID.h" 32 #include "UUID.h"
33 33
34 #include "NotImplemented.h"
35 #include <wtf/CryptographicallyRandomNumber.h> 34 #include <wtf/CryptographicallyRandomNumber.h>
36 #include <wtf/HexNumber.h> 35 #include <wtf/HexNumber.h>
37 #include <wtf/text/StringBuilder.h> 36 #include <wtf/text/StringBuilder.h>
38 37
39 namespace WebCore { 38 namespace WebCore {
40 39
41 String createCanonicalUUIDString() 40 String createCanonicalUUIDString()
42 { 41 {
43 #if USE(OS_RANDOMNESS)
44 unsigned randomData[4]; 42 unsigned randomData[4];
45 cryptographicallyRandomValues(reinterpret_cast<unsigned char*>(randomData), sizeof(randomData)); 43 cryptographicallyRandomValues(reinterpret_cast<unsigned char*>(randomData), sizeof(randomData));
46 44
47 // Format as Version 4 UUID. 45 // Format as Version 4 UUID.
48 StringBuilder builder; 46 StringBuilder builder;
49 builder.reserveCapacity(36); 47 builder.reserveCapacity(36);
50 appendUnsignedAsHexFixedSize(randomData[0], builder, 8, Lowercase); 48 appendUnsignedAsHexFixedSize(randomData[0], builder, 8, Lowercase);
51 builder.append("-"); 49 builder.append("-");
52 appendUnsignedAsHexFixedSize(randomData[1] >> 16, builder, 4, Lowercase); 50 appendUnsignedAsHexFixedSize(randomData[1] >> 16, builder, 4, Lowercase);
53 builder.append("-4"); 51 builder.append("-4");
54 appendUnsignedAsHexFixedSize(randomData[1] & 0x00000fff, builder, 3, Lowerca se); 52 appendUnsignedAsHexFixedSize(randomData[1] & 0x00000fff, builder, 3, Lowerca se);
55 builder.append("-"); 53 builder.append("-");
56 appendUnsignedAsHexFixedSize((randomData[2] >> 30) | 0x8, builder, 1, Lowerc ase); 54 appendUnsignedAsHexFixedSize((randomData[2] >> 30) | 0x8, builder, 1, Lowerc ase);
57 appendUnsignedAsHexFixedSize((randomData[2] >> 16) & 0x00000fff, builder, 3, Lowercase); 55 appendUnsignedAsHexFixedSize((randomData[2] >> 16) & 0x00000fff, builder, 3, Lowercase);
58 builder.append("-"); 56 builder.append("-");
59 appendUnsignedAsHexFixedSize(randomData[2] & 0x0000ffff, builder, 4, Lowerca se); 57 appendUnsignedAsHexFixedSize(randomData[2] & 0x0000ffff, builder, 4, Lowerca se);
60 appendUnsignedAsHexFixedSize(randomData[3], builder, 8, Lowercase); 58 appendUnsignedAsHexFixedSize(randomData[3], builder, 8, Lowercase);
61 return builder.toString(); 59 return builder.toString();
62 #else
63 notImplemented();
64 return String();
65 #endif
66 } 60 }
67 61
68 } 62 }
OLDNEW
« no previous file with comments | « Source/core/page/Crypto.cpp ('k') | Source/wtf/CryptographicallyRandomNumber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698