Security-59306.120.7.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / Access.cpp

diff --git a/OSX/libsecurity_keychain/lib/Access.cpp b/OSX/libsecurity_keychain/lib/Access.cpp
index 64da867e97c9efbd217456f836c058acd19d182c..032bbb6ebd8d39166f357ad9c7852b9af08d1de2 100644 (file)
--- a/OSX/libsecurity_keychain/lib/Access.cpp
+++ b/OSX/libsecurity_keychain/lib/Access.cpp
@@ -27,11 +27,10 @@
 #include <security_keychain/Access.h>
 #include <Security/SecBase.h>
 #include "SecBridge.h"
 #include <security_keychain/Access.h>
 #include <Security/SecBase.h>
 #include "SecBridge.h"

-#include <security_utilities/devrandom.h>
-#include <security_cdsa_utilities/uniformrandom.h>
+#include <Security/SecRandom.h>

 #include <security_cdsa_client/aclclient.h>
 #include <vector>
 #include <security_cdsa_client/aclclient.h>
 #include <vector>

-#include <SecBase.h>
+#include <Security/SecBase.h>

 using namespace KeychainCore;
 using namespace CssmClient;
 
 using namespace KeychainCore;
 using namespace CssmClient;
 


@@ -364,8 +363,9 @@ Access::Maker::Maker(Allocator &alloc, MakerType makerType)
        {
                // generate random key
                mKey.malloc(keySize);
        {
                // generate random key
                mKey.malloc(keySize);

-               UniformRandomBlobs<DevRandomGenerator>().random(mKey.get());
-               
+        CssmData data = mKey.get();
+        MacOSError::check(SecRandomCopyBytes(kSecRandomDefault, data.length(), data.data()));
+        

                // create entry info for resource creation
                mInput = AclEntryPrototype(TypedList(allocator, CSSM_ACL_SUBJECT_TYPE_PASSWORD,
                        new(allocator) ListElement(mKey.get())));
                // create entry info for resource creation
                mInput = AclEntryPrototype(TypedList(allocator, CSSM_ACL_SUBJECT_TYPE_PASSWORD,
                        new(allocator) ListElement(mKey.get())));