Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_apple_csp / lib / RSA_DSA_utils.cpp

diff --git a/OSX/libsecurity_apple_csp/lib/RSA_DSA_utils.cpp b/OSX/libsecurity_apple_csp/lib/RSA_DSA_utils.cpp
index 8ae93c2e218321fceaa9ae30639226a6c113b283..8fb48fd16a94b9001610e95567eea561af4502f5 100644 (file)
--- a/OSX/libsecurity_apple_csp/lib/RSA_DSA_utils.cpp
+++ b/OSX/libsecurity_apple_csp/lib/RSA_DSA_utils.cpp
@@ -26,16 +26,16 @@
 #include <opensslUtils/opensslUtils.h>
 #include <security_utilities/logging.h>
 #include <security_utilities/debugging.h>
 #include <opensslUtils/opensslUtils.h>
 #include <security_utilities/logging.h>
 #include <security_utilities/debugging.h>

-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/err.h>
+#include <openssl/bn_legacy.h>
+#include <openssl/rsa_legacy.h>
+#include <openssl/dsa_legacy.h>
+#include <openssl/opensslerr.h>

 #include <security_utilities/simpleprefs.h>
 #include <security_utilities/threading.h>
 #include <security_utilities/globalizer.h>
 #include <CoreFoundation/CFNumber.h>
 
 #include <security_utilities/simpleprefs.h>
 #include <security_utilities/threading.h>
 #include <security_utilities/globalizer.h>
 #include <CoreFoundation/CFNumber.h>
 

-#define rsaMiscDebug(args...)  secdebug("rsaMisc", ## args)
+#define rsaMiscDebug(args...)  secinfo("rsaMisc", ## args)

 
 /*
  * Obtain and cache max key sizes. System preferences only consulted 
 
 /*
  * Obtain and cache max key sizes. System preferences only consulted 


@@ -100,12 +100,18 @@ RSAKeySizes::RSAKeySizes()
        maxPubExponentSize = RSA_MAX_PUB_EXPONENT_SIZE;
        
        /* now see if there are prefs set for either of these */
        maxPubExponentSize = RSA_MAX_PUB_EXPONENT_SIZE;
        
        /* now see if there are prefs set for either of these */

-       Dictionary* d = Dictionary::CreateDictionary(kRSAKeySizePrefsDomain, Dictionary::US_System, true);
+    Dictionary* d = NULL;
+    try {
+        d = Dictionary::CreateDictionary(kRSAKeySizePrefsDomain, Dictionary::US_System, true);
+    } catch(...) {
+        return;
+    }
+

        if (!d)
        {
                return;
        }
        if (!d)
        {
                return;
        }

-       
+

        if (d->dict())
        {
                auto_ptr<Dictionary>apd(d);
        if (d->dict())
        {
                auto_ptr<Dictionary>apd(d);