Merge pull request #179 from AzureAD/dev

Dev

Author: omercs

ADALiOS/ADALiOS/ADRegistrationInformation.m

@@ -77,18 +77,12 @@ -(void) releaseData{
             _privateKey = nil;
         }
 
-        if(_privateKeyData){
-            CFRelease((__bridge CFTypeRef)_privateKeyData);
-            _privateKeyData = nil;
-        }
-        
         if(_certificateSubject){
             CFRelease((__bridge CFTypeRef)(_certificateSubject));
             _certificateSubject = nil;
         }
 
         if(_certificateData){
-            CFRelease((__bridge CFTypeRef)(_certificateData));
             _certificateData = nil;
         }
 

ADALiOS/ADALiOS/ADWorkPlaceJoinUtil.m

@@ -68,10 +68,10 @@ - (NSData *)getPrivateKeyForAccessGroup: (NSString*) sharedAccessGroup
         if (*error != NULL)
         {
             *error = [self buildNSErrorForDomain:errorDomain
-                                  errorCode:sharedKeychainPermission
-                               errorMessage: [NSString stringWithFormat:unabletoReadFromSharedKeychain, sharedAccessGroup]
-                            underlyingError:nil
-                                shouldRetry:false];
+                                       errorCode:sharedKeychainPermission
+                                    errorMessage: [NSString stringWithFormat:unabletoReadFromSharedKeychain, sharedAccessGroup]
+                                 underlyingError:nil
+                                     shouldRetry:false];
         }
     }
 
@@ -81,7 +81,7 @@ - (NSData *)getPrivateKeyForAccessGroup: (NSString*) sharedAccessGroup
 
 
 - (ADRegistrationInformation*)getRegistrationInformation: (NSString*) sharedAccessGroup
-                                                 error: (NSError**) error
+                                                   error: (NSError**) error
 {
     AD_LOG_VERBOSE_F(@"Attempting to get registration information - ", @"%@ shared access Group", sharedAccessGroup);
 
@@ -103,15 +103,15 @@ - (ADRegistrationInformation*)getRegistrationInformation: (NSString*) sharedAcce
 #if !TARGET_IPHONE_SIMULATOR
     [identityAttr setObject:sharedAccessGroup forKey:(__bridge id)kSecAttrAccessGroup];
 #endif
-   
-    SecItemCopyMatching((__bridge CFDictionaryRef)identityAttr, (CFTypeRef*)&identity);
 
-    //Get the identity		
-    if(identity)
+    OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)identityAttr, (CFTypeRef*)&identity);
+    
+    //Get the identity
+    if(status == errSecSuccess && identity)
     {
         AD_LOG_VERBOSE(@"Found identity in keychain", nil);
         //Get the certificate and data
-        SecIdentityCopyCertificate(identity, &certificate);
+        status = SecIdentityCopyCertificate(identity, &certificate);
         if(certificate)
         {
             AD_LOG_VERBOSE(@"Found certificate in keychain", nil);
@@ -120,14 +120,8 @@ - (ADRegistrationInformation*)getRegistrationInformation: (NSString*) sharedAcce
         }
 
         //Get the private key and data
-        SecIdentityCopyPrivateKey(identity, &privateKey);
-        if(privateKey)
-        {
-            AD_LOG_VERBOSE(@"Retrieved privatekey", nil);
-            privateKeyData = [self getPrivateKeyForAccessGroup:sharedAccessGroup privateKeyIdentifier:privateKeyIdentifier error:error];
-        }
-        
-        if (error)
+        status = SecIdentityCopyPrivateKey(identity, &privateKey);
+        if (status != errSecSuccess)
         {
             if (certificateSubject)
                 CFRelease((__bridge CFTypeRef)(certificateSubject));
@@ -137,25 +131,24 @@ - (ADRegistrationInformation*)getRegistrationInformation: (NSString*) sharedAcce
             return nil;
         }
 
-        //privateKey = [self getPrivateKeyRef];
     }
 
-    if(identity && certificate && certificateSubject && certificateData && privateKey && privateKeyData)
+    if(identity && certificate && certificateSubject && certificateData && privateKey)
     {
         ADRegistrationInformation *info = [[ADRegistrationInformation alloc] initWithSecurityIdentity:identity
-                                                                                userPrincipalName:userPrincipalName
-                                                                            certificateProperties:certificateProperties
-                                                                                      certificate:certificate
-                                                                               certificateSubject:certificateSubject
-                                                                                  certificateData:certificateData
-                                                                                       privateKey:privateKey
-                                                                                   privateKeyData:privateKeyData];
+                                                                                    userPrincipalName:userPrincipalName
+                                                                                certificateProperties:certificateProperties
+                                                                                          certificate:certificate
+                                                                                   certificateSubject:certificateSubject
+                                                                                      certificateData:certificateData
+                                                                                           privateKey:privateKey
+                                                                                       privateKeyData:privateKeyData];
         return info;
     }
     else
     {
         AD_LOG_VERBOSE_F(@"Unable to extract a workplace join identity for", @"%@ shared access keychain",
-                                sharedAccessGroup);
+                         sharedAccessGroup);
         if (certificateSubject)
             CFRelease((__bridge CFTypeRef)(certificateSubject));
         if (certificateData)
@@ -190,13 +183,13 @@ - (NSError*)getCertificateForAccessGroup: (NSString*)sharedAccessGroup
     else
     {
         return [self buildNSErrorForDomain:errorDomain
-                                   errorCode:sharedKeychainPermission
-                                errorMessage: [NSString stringWithFormat:unabletoReadFromSharedKeychain, sharedAccessGroup]
-                             underlyingError:nil
-                                 shouldRetry:false];
+                                 errorCode:sharedKeychainPermission
+                              errorMessage: [NSString stringWithFormat:unabletoReadFromSharedKeychain, sharedAccessGroup]
+                           underlyingError:nil
+                               shouldRetry:false];
     }
 
-
+    
 }
 
 
@@ -236,7 +229,7 @@ - (NSData *)base64DataFromString: (NSString *)string
     {
         return [NSData data];
     }
-
+    
     charString = (const unsigned char *)[string UTF8String];
 
     theData = [NSMutableData dataWithCapacity: [string length]];
@@ -290,7 +283,7 @@ - (NSData *)base64DataFromString: (NSString *)string
             }
 
         }
-
+        
     }
 
     return theData;
@@ -301,7 +294,7 @@ - (NSString*)getApplicationIdentifierPrefix{
     AD_LOG_VERBOSE(@"Looking for application identifier prefix in app data", nil);
     NSUserDefaults* c = [NSUserDefaults standardUserDefaults];
     NSString* appIdentifierPrefix = [c objectForKey:applicationIdentifierPrefix];
-
+    
     if (!appIdentifierPrefix)
     {
         appIdentifierPrefix = [self bundleSeedID];
@@ -337,32 +330,5 @@ - (NSString*)bundleSeedID {
     return bundleSeedID;
 }
 
-- (SecKeyRef)getPrivateKeyRef {
-    OSStatus sanityCheck = noErr;
-    SecKeyRef privateKeyReference = NULL;
-    
-    NSData *privateKeyTag = [NSData dataWithBytes:[privateKeyIdentifier UTF8String] length:privateKeyIdentifier.length];
-    
-    NSMutableDictionary * queryPrivateKey = [[NSMutableDictionary alloc] init];
-    
-    // Set the private key query dictionary.
-    [queryPrivateKey setObject:(__bridge id)kSecClassKey forKey:(__bridge id)kSecClass];
-    [queryPrivateKey setObject:privateKeyTag forKey:(__bridge id)kSecAttrApplicationTag];
-    [queryPrivateKey setObject:(__bridge id)kSecAttrKeyTypeRSA forKey:(__bridge id)kSecAttrKeyType];
-    [queryPrivateKey setObject:[NSNumber numberWithBool:YES] forKey:(__bridge id)kSecReturnRef];
-#if !TARGET_IPHONE_SIMULATOR
-    [queryPrivateKey setObject:@"com.microsoft.workplacejoin" forKey:(__bridge id)kSecAttrAccessGroup];
-#endif
-    // Get the key.
-    sanityCheck = SecItemCopyMatching((__bridge CFDictionaryRef)queryPrivateKey, (CFTypeRef *)&privateKeyReference);
-    
-    if (sanityCheck != noErr)
-    {
-        privateKeyReference = NULL;
-    }
-    
-    return privateKeyReference;
-}
-
 @end