Security-59754.80.3.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecBase.cpp b/OSX/libsecurity_keychain/lib/SecBase.cpp
index 096349ed49029d1574417d16fd7d7bb902d6d8f3..cf69d48a2ae0323d3ba8d0333738ac2e56f8512f 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecBase.cpp
+++ b/OSX/libsecurity_keychain/lib/SecBase.cpp
@@ -27,6 +27,7 @@
 #include <security_utilities/threading.h>
 #include <utilities/SecCFRelease.h>
 #include "SecBridge.h"
+#include <Security/SecFramework.h>
 
 static CFStringRef copyErrorMessageFromBundle(OSStatus status,CFStringRef tableName);
 
@@ -98,7 +99,7 @@ cssmErrorString(CSSM_RETURN error)
                        CFStringRef result = copyErrorMessageFromBundle(error,CFSTR("SecErrorMessages"));
                        if (result == NULL)
                                result = copyErrorMessageFromBundle(error,CFSTR("SecDebugErrorMessages"));
-                       err = cfString(result, true);
+                       err = cfString(result, errSecErrorStringNotAvailable);
             CFReleaseSafe(result);
                }
                
@@ -140,10 +141,11 @@ copyErrorMessageFromBundle(OSStatus status,CFStringRef tableName)
        
     // Convert status to Int32 string representation, e.g. "-25924"
     keyString = CFStringCreateWithFormat (kCFAllocatorDefault,NULL,CFSTR("%d"),(int)status);
-    if (!keyString)
+    if (!keyString) {
         goto xit;
+    }
 
-       errorString = CFCopyLocalizedStringFromTableInBundle(keyString,tableName,secBundle,NULL);
+    errorString = CFCopyLocalizedStringFromTableInBundle(keyString,tableName,secBundle,NULL);
     if (CFStringCompare(errorString, keyString, 0)==kCFCompareEqualTo) // no real error message
        {
                if (errorString)
@@ -299,7 +301,7 @@ OSStatus SecKeychainErrFromOSStatus(OSStatus osStatus)
                case CSSMERR_DL_DATASTORE_ALREADY_EXISTS:
                        return errSecDuplicateKeychain;
                case CSSMERR_APPLEDL_DISK_FULL:
-                       return errSecDskFull;
+                       return errSecDiskFull;
                case CSSMERR_DL_INVALID_OPEN_PARAMETERS: 
                case CSSMERR_APPLEDL_INVALID_OPEN_PARAMETERS:
                case CSSMERR_APPLE_DOTMAC_REQ_SERVER_PARAM: