# HG changeset patch
# User snej@snej.local
# Date 1239598836 25200
# Node ID 47d10ac2d04ea133eec594aa9fbd33fc26d4b4b7
# Parent  629c7605ab2affd39fe98b3334f3ef1a004bbce2
Fixed some incorrect CSSM error code strings. Removed a log call from MYError.

diff -r 629c7605ab2a -r 47d10ac2d04e MYErrorUtils.m
--- a/MYErrorUtils.m	Wed Apr 08 16:31:19 2009 -0700
+++ b/MYErrorUtils.m	Sun Apr 12 22:00:36 2009 -0700
@@ -19,10 +19,9 @@
 static NSError *MYMakeErrorV( int errorCode, NSString *domain, NSString *message, va_list args )
 {
     message = [[NSString alloc] initWithFormat: message arguments: args];
-    Log(@"MYError #%i: %@",errorCode,message);
     NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
-                              message, NSLocalizedDescriptionKey,
-                              nil];
+                                                      message, NSLocalizedDescriptionKey,
+                                                      nil];
     [message release];
     return [NSError errorWithDomain: domain
                                code: errorCode
@@ -49,7 +48,9 @@
             va_start(args,messageFormat);
             *outError = MYMakeErrorV(errorCode, domain, messageFormat, args);
             va_end(args);
-        }
+            Log(@"MYReturnError: %@",*outError);
+        } else
+            Log(@"MYReturnError: %@/%i",domain,errorCode);
         return NO;
     } else
         return YES;
diff -r 629c7605ab2a -r 47d10ac2d04e MYError_CSSMErrorDomain.strings
--- a/MYError_CSSMErrorDomain.strings	Wed Apr 08 16:31:19 2009 -0700
+++ b/MYError_CSSMErrorDomain.strings	Sun Apr 12 22:00:36 2009 -0700
@@ -428,23 +428,23 @@
 2147551494 = "CSSMERR_CSP_ATTACH_HANDLE_BUSY";
 2147551495 = "CSSMERR_CSP_NOT_LOGGED_IN";
 
-2147551506 = "CSSMERR_CSP_INVALID_KEY";
-2147551507 = "CSSMERR_CSP_INVALID_KEY_REFERENCE";
-2147551508 = "CSSMERR_CSP_INVALID_KEY_CLASS";
-2147551509 = "CSSMERR_CSP_ALGID_MISMATCH";
-2147551510 = "CSSMERR_CSP_KEY_USAGE_INCORRECT";
-2147551511 = "CSSMERR_CSP_KEY_BLOB_TYPE_INCORRECT";
-2147551512 = "CSSMERR_CSP_KEY_HEADER_INCONSISTENT";
-2147551513 = "CSSMERR_CSP_UNSUPPORTED_KEY_FORMAT";
-2147551514 = "CSSMERR_CSP_UNSUPPORTED_KEY_SIZE";
-2147551515 = "CSSMERR_CSP_INVALID_KEY_POINTER";
-2147551516 = "CSSMERR_CSP_INVALID_KEYUSAGE_MASK";
-2147551517 = "CSSMERR_CSP_UNSUPPORTED_KEYUSAGE_MASK";
-2147551518 = "CSSMERR_CSP_INVALID_KEYATTR_MASK";
-2147551519 = "CSSMERR_CSP_UNSUPPORTED_KEYATTR_MASK";
-2147551520 = "CSSMERR_CSP_INVALID_KEY_LABEL";
-2147551521 = "CSSMERR_CSP_UNSUPPORTED_KEY_LABEL";
-2147551522 = "CSSMERR_CSP_INVALID_KEY_FORMAT";
+2147551504 = "CSSMERR_CSP_INVALID_KEY";
+2147551505 = "CSSMERR_CSP_INVALID_KEY_REFERENCE";
+2147551506 = "CSSMERR_CSP_INVALID_KEY_CLASS";
+2147551507 = "CSSMERR_CSP_ALGID_MISMATCH";
+2147551508 = "CSSMERR_CSP_KEY_USAGE_INCORRECT";
+2147551509 = "CSSMERR_CSP_KEY_BLOB_TYPE_INCORRECT";
+2147551510 = "CSSMERR_CSP_KEY_HEADER_INCONSISTENT";
+2147551511 = "CSSMERR_CSP_UNSUPPORTED_KEY_FORMAT";
+2147551512 = "CSSMERR_CSP_UNSUPPORTED_KEY_SIZE";
+2147551513 = "CSSMERR_CSP_INVALID_KEY_POINTER";
+2147551514 = "CSSMERR_CSP_INVALID_KEYUSAGE_MASK";
+2147551515 = "CSSMERR_CSP_UNSUPPORTED_KEYUSAGE_MASK";
+2147551516 = "CSSMERR_CSP_INVALID_KEYATTR_MASK";
+2147551517 = "CSSMERR_CSP_UNSUPPORTED_KEYATTR_MASK";
+2147551518 = "CSSMERR_CSP_INVALID_KEY_LABEL";
+2147551519 = "CSSMERR_CSP_UNSUPPORTED_KEY_LABEL";
+2147551520 = "CSSMERR_CSP_INVALID_KEY_FORMAT";
 
 2147551528 = "CSSMERR_CSP_INVALID_DATA_COUNT";
 2147551529 = "CSSMERR_CSP_VECTOR_OF_BUFS_UNSUPPORTED";