Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add macOS 10.10+ / iOS 8.0+ PRNG CCRandomGenerateBytes() #1135

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add macOS 10.10+ / iOS 8.0+ PRNG CCRandomGenerateBytes() #1135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions osrng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
# include <stdlib.h>
#endif

#if defined(__APPLE__)
/* OS X 10.10+, iOS 8.0+ */
#if defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000
#define USE_CCRANDOMGENERATEBYTES
#elif defined(__AVAILABILITY_INTERNAL__IPHONE_8_0_DEP__IPHONE_8_0)
#define USE_CCRANDOMGENERATEBYTES
#endif
Comment on lines +38 to +42
Copy link

@AraHaan AraHaan Jul 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000
#define USE_CCRANDOMGENERATEBYTES
#elif defined(__AVAILABILITY_INTERNAL__IPHONE_8_0_DEP__IPHONE_8_0)
#define USE_CCRANDOMGENERATEBYTES
#endif
#if (defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000) || defined(__AVAILABILITY_INTERNAL__IPHONE_8_0_DEP__IPHONE_8_0)
#define USE_CCRANDOMGENERATEBYTES
#endif

#endif

#ifdef USE_CCRANDOMGENERATEBYTES
#include <CommonCrypto/CommonRandom.h>
#endif

// Solaris links /dev/urandom -> ../devices/pseudo/random@0:urandom
// We can't access the device. Avoid O_NOFOLLOW for the platform.
#ifdef __sun
Expand Down Expand Up @@ -156,7 +169,7 @@ MicrosoftCryptoProvider::~MicrosoftCryptoProvider()

NonblockingRng::NonblockingRng()
{
#if !defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_FREEBSD_ARC4RANDOM)
#if !defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_FREEBSD_ARC4RANDOM) && !defined(USE_CCRANDOMGENERATEBYTES)
# ifndef DONT_USE_O_NOFOLLOW
const int flags = O_RDONLY|O_NOFOLLOW;
# else
Expand All @@ -172,7 +185,7 @@ NonblockingRng::NonblockingRng()

NonblockingRng::~NonblockingRng()
{
#if !defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_FREEBSD_ARC4RANDOM)
#if !defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_FREEBSD_ARC4RANDOM) && !defined(USE_CCRANDOMGENERATEBYTES)
close(m_fd);
#endif
}
Expand Down Expand Up @@ -221,6 +234,11 @@ void NonblockingRng::GenerateBlock(byte *output, size_t size)
// Cryptographic quality prng based on ChaCha20,
// https://www.freebsd.org/cgi/man.cgi?query=arc4random_buf
arc4random_buf(output, size);
# elif defined(USE_CCRANDOMGENERATEBYTES)
// Cryptographic quality prng built into macOS 10.10+ and iOS 8.0+
// https://opensource.apple.com/source/CommonCrypto/CommonCrypto-60074/include/CommonRandom.h.auto.html
if (CCRandomGenerateBytes(output, size) != kCCSuccess)
throw OS_RNG_Err("CCRandomGenerateBytes");
# else
while (size)
{
Expand Down