Update rand_bytes()

This commit is contained in:
Zhi Guan
2022-12-22 17:08:50 +08:00
parent 950ef49fb6
commit 9ce7a54649
6 changed files with 60 additions and 76 deletions

View File

@@ -1,46 +0,0 @@
/*
* Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License.
*
* http://www.apache.org/licenses/LICENSE-2.0
*/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <gmssl/rand.h>
#include <gmssl/error.h>
#define RAND_MAX_BUF_SIZE 4096
int rand_bytes(uint8_t *buf, size_t len)
{
FILE *fp;
if (!buf) {
error_print();
return -1;
}
if (len > RAND_MAX_BUF_SIZE) {
error_print();
return -1;
}
if (!len) {
return 0;
}
if (!(fp = fopen("/dev/urandom", "rb"))) {
error_print();
return -1;
}
if (fread(buf, 1, len, fp) != len) {
error_print();
fclose(fp);
return -1;
}
fclose(fp);
return 1;
}

View File

@@ -20,12 +20,15 @@ int rand_bytes(uint8_t *buf, size_t len)
{
int errCode;
if ((errCode = SecRandomCopyBytes(kSecRandomDefault, len, buf)) != errSecSuccess) {
//CFStringRef errStr;
//errStr = SecCopyErrorMessageString(errCode, NULL);
//CFRelease(errStr);
error_print();
fprintf(stderr, "%s:%d: SecRandomCopyBytes() return OSStatus = %d\n", __FILE__, __LINE__, errCode);
/*
CFStringRef errStr;
errStr = SecCopyErrorMessageString(errCode, NULL);
fprintf(stderr, "error: %s\n", CFStringGetCStringPtr(errStr, kCFStringEncodingMacRoman));
CFRelease(errStr); // -framework CoreFoundation
*/
return -1;
}
return 1;
}

View File

@@ -14,7 +14,9 @@
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h> // in Linux
//#include <sys/random.h> // in Apple
#ifdef APPLE
#include <sys/random.h> // in Apple
#endif
#include <gmssl/rand.h>
#include <gmssl/error.h>
@@ -37,4 +39,3 @@ int rand_bytes(uint8_t *buf, size_t len)
}
return 1;
}