Fixed some incorrect CSSM error code strings. Removed a log call from MYError.
1.1 --- a/MYErrorUtils.m Wed Apr 08 16:31:19 2009 -0700
1.2 +++ b/MYErrorUtils.m Sun Apr 12 22:00:36 2009 -0700
1.3 @@ -19,10 +19,9 @@
1.4 static NSError *MYMakeErrorV( int errorCode, NSString *domain, NSString *message, va_list args )
1.5 {
1.6 message = [[NSString alloc] initWithFormat: message arguments: args];
1.7 - Log(@"MYError #%i: %@",errorCode,message);
1.8 NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
1.9 - message, NSLocalizedDescriptionKey,
1.10 - nil];
1.11 + message, NSLocalizedDescriptionKey,
1.12 + nil];
1.13 [message release];
1.14 return [NSError errorWithDomain: domain
1.15 code: errorCode
1.16 @@ -49,7 +48,9 @@
1.17 va_start(args,messageFormat);
1.18 *outError = MYMakeErrorV(errorCode, domain, messageFormat, args);
1.19 va_end(args);
1.20 - }
1.21 + Log(@"MYReturnError: %@",*outError);
1.22 + } else
1.23 + Log(@"MYReturnError: %@/%i",domain,errorCode);
1.24 return NO;
1.25 } else
1.26 return YES;
2.1 --- a/MYError_CSSMErrorDomain.strings Wed Apr 08 16:31:19 2009 -0700
2.2 +++ b/MYError_CSSMErrorDomain.strings Sun Apr 12 22:00:36 2009 -0700
2.3 @@ -428,23 +428,23 @@
2.4 2147551494 = "CSSMERR_CSP_ATTACH_HANDLE_BUSY";
2.5 2147551495 = "CSSMERR_CSP_NOT_LOGGED_IN";
2.6
2.7 -2147551506 = "CSSMERR_CSP_INVALID_KEY";
2.8 -2147551507 = "CSSMERR_CSP_INVALID_KEY_REFERENCE";
2.9 -2147551508 = "CSSMERR_CSP_INVALID_KEY_CLASS";
2.10 -2147551509 = "CSSMERR_CSP_ALGID_MISMATCH";
2.11 -2147551510 = "CSSMERR_CSP_KEY_USAGE_INCORRECT";
2.12 -2147551511 = "CSSMERR_CSP_KEY_BLOB_TYPE_INCORRECT";
2.13 -2147551512 = "CSSMERR_CSP_KEY_HEADER_INCONSISTENT";
2.14 -2147551513 = "CSSMERR_CSP_UNSUPPORTED_KEY_FORMAT";
2.15 -2147551514 = "CSSMERR_CSP_UNSUPPORTED_KEY_SIZE";
2.16 -2147551515 = "CSSMERR_CSP_INVALID_KEY_POINTER";
2.17 -2147551516 = "CSSMERR_CSP_INVALID_KEYUSAGE_MASK";
2.18 -2147551517 = "CSSMERR_CSP_UNSUPPORTED_KEYUSAGE_MASK";
2.19 -2147551518 = "CSSMERR_CSP_INVALID_KEYATTR_MASK";
2.20 -2147551519 = "CSSMERR_CSP_UNSUPPORTED_KEYATTR_MASK";
2.21 -2147551520 = "CSSMERR_CSP_INVALID_KEY_LABEL";
2.22 -2147551521 = "CSSMERR_CSP_UNSUPPORTED_KEY_LABEL";
2.23 -2147551522 = "CSSMERR_CSP_INVALID_KEY_FORMAT";
2.24 +2147551504 = "CSSMERR_CSP_INVALID_KEY";
2.25 +2147551505 = "CSSMERR_CSP_INVALID_KEY_REFERENCE";
2.26 +2147551506 = "CSSMERR_CSP_INVALID_KEY_CLASS";
2.27 +2147551507 = "CSSMERR_CSP_ALGID_MISMATCH";
2.28 +2147551508 = "CSSMERR_CSP_KEY_USAGE_INCORRECT";
2.29 +2147551509 = "CSSMERR_CSP_KEY_BLOB_TYPE_INCORRECT";
2.30 +2147551510 = "CSSMERR_CSP_KEY_HEADER_INCONSISTENT";
2.31 +2147551511 = "CSSMERR_CSP_UNSUPPORTED_KEY_FORMAT";
2.32 +2147551512 = "CSSMERR_CSP_UNSUPPORTED_KEY_SIZE";
2.33 +2147551513 = "CSSMERR_CSP_INVALID_KEY_POINTER";
2.34 +2147551514 = "CSSMERR_CSP_INVALID_KEYUSAGE_MASK";
2.35 +2147551515 = "CSSMERR_CSP_UNSUPPORTED_KEYUSAGE_MASK";
2.36 +2147551516 = "CSSMERR_CSP_INVALID_KEYATTR_MASK";
2.37 +2147551517 = "CSSMERR_CSP_UNSUPPORTED_KEYATTR_MASK";
2.38 +2147551518 = "CSSMERR_CSP_INVALID_KEY_LABEL";
2.39 +2147551519 = "CSSMERR_CSP_UNSUPPORTED_KEY_LABEL";
2.40 +2147551520 = "CSSMERR_CSP_INVALID_KEY_FORMAT";
2.41
2.42 2147551528 = "CSSMERR_CSP_INVALID_DATA_COUNT";
2.43 2147551529 = "CSSMERR_CSP_VECTOR_OF_BUFS_UNSUPPORTED";