gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

move random data generation out to category for easier use

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37558 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-01-08 11:14:53 +00:00
parent 150289de30
commit 99517dd9b1
4 changed files with 102 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Source/NSUUID.m
View file

@ -26,12 +26,8 @@
#import "common.h"
#import "Foundation/NSCoder.h"
#import "Foundation/NSUUID.h"
#import "GNUstepBase/NSData+GNUstepBase.h"
#if defined(__MINGW32__)
#include <wincrypt.h>
#else
#include <fcntl.h>
#endif
static int uuid_from_string(const char *string, unsigned char *uuid);
static void string_from_uuid(const unsigned char *uuid, char *string);
@ -260,6 +256,7 @@ static void string_from_uuid(const unsigned char *uuid, char *string)
static int random_uuid(unsigned char *uuid)
{
NSData *rnd;
unsigned char timeByte;
unsigned char sequenceByte;
@ -268,40 +265,13 @@ static int random_uuid(unsigned char *uuid)
* problems (and are more work...)
*/
#if defined(__MINGW32__)
HCRYPTPROV hProvider = 0;
if (!CryptAcquireContextW(&hProvider, 0, 0,
PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
rnd = [NSData dataWithRandomBytesOfLength: kUUIDByteCount];
if (nil == rnd)
{
return -1;
}
if (!CryptGenRandom(hProvider, kUUIDByteCount, uuid))
{
CryptReleaseContext(hProvider, 0);
return -1;
}
CryptReleaseContext(hProvider, 0);
#else
int devUrandom;
ssize_t bytesRead;
devUrandom = open("/dev/urandom", O_RDONLY);
if (devUrandom == -1)
{
return -1;
}
bytesRead = read(devUrandom, uuid, kUUIDByteCount);
close(devUrandom);
if (bytesRead != kUUIDByteCount)
{
return -1;
}
#endif
memcpy(uuid, [rnd bytes], kUUIDByteCount);
/* as required by the RFC, bits 48-51 should contain 0b0100 (4)
* and bits 64-65 should contain 0b01 (1)