Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / devrandom.h

diff --git a/OSX/libsecurity_utilities/lib/devrandom.h b/OSX/libsecurity_utilities/lib/devrandom.h
index adf38e6a6810ae61f0977602d50e8cf7a452656d..a2bf448ae0b4ae3cf16393ade475deb8ce722149 100644 (file)
--- a/OSX/libsecurity_utilities/lib/devrandom.h
+++ b/OSX/libsecurity_utilities/lib/devrandom.h
@@ -37,14 +37,12 @@ namespace Security {
 
 
 //
 
 
 //

-// This RNG uses /dev/random.
-// It is not repeatable. AddEntropy() contributes random entropy to a global pool (only).
+// This RNG doesn't use /dev/random for reading, it uses CommonCrypto
+// (same as SecRandom does).  It is not repeatable.
+//
+// AddEntropy() contributes random entropy to a global pool (only).

 //
 class DevRandomGenerator {
 //
 class DevRandomGenerator {

-       struct Readonly : public UnixPlusPlus::FileDesc {
-               Readonly() { open("/dev/random", O_RDONLY); }
-       };
-       

        struct Writable : public UnixPlusPlus::FileDesc {
                Writable() { open("/dev/random", O_RDWR); }
        };
        struct Writable : public UnixPlusPlus::FileDesc {
                Writable() { open("/dev/random", O_RDWR); }
        };


@@ -56,7 +54,6 @@ public:
     void addEntropy(const void *data, size_t length);
 
 private:
     void addEntropy(const void *data, size_t length);
 
 private:

-    static ModuleNexus<Readonly> mReader;

        static ModuleNexus<Writable> mWriter;
 };
 
        static ModuleNexus<Writable> mWriter;
 };