1.1 --- a/MYCrypto_Private.h	Sun Jun 07 21:53:56 2009 -0700
     1.2 +++ b/MYCrypto_Private.h	Tue Jul 21 10:13:08 2009 -0700
     1.3 @@ -13,6 +13,8 @@
     1.4  #import "MYPublicKey.h"
     1.5  #import "MYPrivateKey.h"
     1.6  #import "MYCertificate.h"
     1.7 +#import "MYCertificateInfo.h"
     1.8 +
     1.9  #import "Test.h"
    1.10  #import <Security/Security.h>
    1.11  
    1.12 @@ -33,6 +35,9 @@
    1.13  @property (readonly) CSSM_CSP_HANDLE CSPHandle;
    1.14  @property (readonly) NSString* path;
    1.15  #endif
    1.16 +#if MYCRYPTO_USE_IPHONE_API
    1.17 ++ (CFTypeRef) _addItemWithInfo: (NSMutableDictionary*)info;
    1.18 +#endif
    1.19  @end
    1.20  
    1.21  
    1.22 @@ -56,9 +61,7 @@
    1.23  @property (readonly) SecExternalItemType keyClass, keyType;
    1.24  @property (readonly) MYSHA1Digest* _keyDigest;
    1.25  - (NSData*) _crypt: (NSData *)data operation: (BOOL) op;    // YES to encrypt, NO to decrypt
    1.26 -#if MYCRYPTO_USE_IPHONE_API
    1.27 -+ (SecKeyRef) _addKeyWithInfo: (NSMutableDictionary*)info;
    1.28 -#else
    1.29 +#if !MYCRYPTO_USE_IPHONE_API
    1.30  @property (readonly) const CSSM_KEY* cssmKey;
    1.31  @property (readonly) const CSSM_CSP_HANDLE cssmCSPHandle;
    1.32  - (CSSM_CC_HANDLE) _createSignatureContext: (CSSM_ALGORITHMS)algorithm;
    1.33 @@ -79,6 +82,7 @@
    1.34  
    1.35  
    1.36  @interface MYPublicKey (Private)
    1.37 +@property (retain) MYCertificate *certificate;
    1.38  - (BOOL) setValue: (NSString*)valueStr ofAttribute: (SecKeychainAttrType)attr;
    1.39  #if !TARGET_OS_IPHONE
    1.40  - (CSSM_WRAP_KEY*) _unwrappedCSSMKey;
    1.41 @@ -117,6 +121,15 @@
    1.42  #endif
    1.43  
    1.44  
    1.45 +@interface MYCertificateInfo (Private)
    1.46 +- (NSData*) subjectPublicKeyData;
    1.47 +- (MYPublicKey*) subjectPublicKey;
    1.48 +- (NSData*) signedData;
    1.49 +- (MYOID*) signatureAlgorithmID;
    1.50 +- (NSData*) signature;
    1.51 +@end                    
    1.52 +
    1.53 +
    1.54  #undef check
    1.55  BOOL check(OSStatus err, NSString *what);
    1.56