Security-59754.80.3.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecWrappedKeys.cpp b/OSX/libsecurity_keychain/lib/SecWrappedKeys.cpp
index e42f34c2d755f36fb877f75430bec907df1fe074..a438f948c2098926833d57f140cd9a248e66b439 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecWrappedKeys.cpp
+++ b/OSX/libsecurity_keychain/lib/SecWrappedKeys.cpp
@@ -33,9 +33,8 @@
 #include <Security/SecKeyPriv.h>
 #include <security_asn1/SecNssCoder.h>
 #include <security_cdsa_utils/cuCdsaUtils.h>
 #include <Security/SecKeyPriv.h>
 #include <security_asn1/SecNssCoder.h>
 #include <security_cdsa_utils/cuCdsaUtils.h>

-#include <security_utilities/devrandom.h>

 
 

-#include <assert.h>
+#include <security_utilities/simulatecrash_assert.h>

 
 using namespace Security;
 using namespace KeychainCore;
 
 using namespace Security;
 using namespace KeychainCore;


@@ -377,7 +376,6 @@ OSStatus impExpWrappedKeyOpenSslExport(
        const char                                                      **pemHeader,    // RETURNED
        CFArrayRef                                                      *pemParamLines) // RETURNED
 {
        const char                                                      **pemHeader,    // RETURNED
        CFArrayRef                                                      *pemParamLines) // RETURNED
 {

-       DevRandomGenerator              rng;

        SecNssCoder                             coder;
        CSSM_CSP_HANDLE                 cspHand = 0;
        OSStatus                                ortn;
        SecNssCoder                             coder;
        CSSM_CSP_HANDLE                 cspHand = 0;
        OSStatus                                ortn;


@@ -405,8 +403,8 @@ OSStatus impExpWrappedKeyOpenSslExport(
        /* 8 bytes of random IV/salt */
        uint8 saltIv[8];
        CSSM_DATA saltIvData = { 8, saltIv} ;
        /* 8 bytes of random IV/salt */
        uint8 saltIv[8];
        CSSM_DATA saltIvData = { 8, saltIv} ;

-       rng.random(saltIv, 8);
-       
+    MacOSError::check(SecRandomCopyBytes(kSecRandomDefault, sizeof(saltIv), saltIv));
+    

        /* derive wrapping key */
        CSSM_KEY        wrappingKey;
        wrappingKey.KeyData.Data = NULL;
        /* derive wrapping key */
        CSSM_KEY        wrappingKey;
        wrappingKey.KeyData.Data = NULL;