Skip to content

Commit

Permalink
20.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyle-Reis committed Sep 16, 2024
1 parent e394140 commit b8f29e3
Show file tree
Hide file tree
Showing 266 changed files with 2,138 additions and 3,611 deletions.
Binary file modified IntuneMAMConfigurator
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/Assets.car
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/Base.lproj/PinViewController.nib
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/DiagnosticAppStatusViewController.nib
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/DiagnosticUploadViewController.nib
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/DiagnosticViewController.nib
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/Info.plist
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/MTDComplianceViewController.nib
Binary file not shown.
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/_CodeSignature/CodeDirectory
Binary file not shown.
Binary file modified IntuneMAMResources.bundle/_CodeSignature/CodeRequirements-1
Binary file not shown.
42 changes: 21 additions & 21 deletions IntuneMAMResources.bundle/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</data>
<key>Assets.car</key>
<data>
vbnHJyvBNbX53OGoWESLakT+8EU=
KPjZYNAg7kTWi69sD1kVNc6OMrg=
</data>
<key>AuthViewController_iPad.nib</key>
<data>
Expand All @@ -22,7 +22,7 @@
</data>
<key>Base.lproj/PinViewController.nib</key>
<data>
iiGClpJd+PMz8z+fbci2fKmJhew=
arS3YygLBl7uFQnI206CGPWyKD8=
</data>
<key>BlurViewController_iPad.nib</key>
<data>
Expand All @@ -34,23 +34,23 @@
</data>
<key>DiagnosticAppStatusViewController.nib</key>
<data>
/F9BPF3Q97VZXF/FETthLuO3QCA=
Oz4JYvEPe4VuBVI0HZwOmmLCSKM=
</data>
<key>DiagnosticUploadViewController.nib</key>
<data>
LudjMlqZwSVbejkS2Bp+TwgSWLE=
kgSgO2B4X1CnHxoQj8Xy7s8/peA=
</data>
<key>DiagnosticViewController.nib</key>
<data>
S6+xp1BLTkZwa5wn758AVwJGbSE=
yNIwVqhM8XHWr2v95gZRffB5uMQ=
</data>
<key>MTDComplianceViewController.nib</key>
<data>
P7SSsJAgKtIKGggVYWyLy2cXefU=
c4Cnyyd4DRTeEBrnj56SyiA0H+I=
</data>
<key>MTDComplianceViewControllerUnlistedMTDApp.nib</key>
<data>
S4O4K6yN2b41Qze8HjNlF2aQHjw=
e1ScPjuMUZW0WjR4R5cEdVVpZ5s=
</data>
<key>MessageViewController.nib</key>
<data>
Expand Down Expand Up @@ -584,11 +584,11 @@
<dict>
<key>hash</key>
<data>
vbnHJyvBNbX53OGoWESLakT+8EU=
KPjZYNAg7kTWi69sD1kVNc6OMrg=
</data>
<key>hash2</key>
<data>
AEvHqf44o0UdfOTKDKfkcCp2cSKcgV6beLhwCsNdjS0=
H2njAIR7SBqHJEdXlTOEPcyuGndrzCzqXGl7mflG3JM=
</data>
</dict>
<key>AuthViewController_iPad.nib</key>
Expand Down Expand Up @@ -617,11 +617,11 @@
<dict>
<key>hash</key>
<data>
iiGClpJd+PMz8z+fbci2fKmJhew=
arS3YygLBl7uFQnI206CGPWyKD8=
</data>
<key>hash2</key>
<data>
NUViYOWEc/PJ2jegBn0jKyDZyXrnaqUslNEM0YdzhN0=
IG+JOrG+z6aaJrcsB9r4d95ZEl+Gmj35PGKTw5gVbsU=
</data>
</dict>
<key>BlurViewController_iPad.nib</key>
Expand Down Expand Up @@ -650,55 +650,55 @@
<dict>
<key>hash</key>
<data>
/F9BPF3Q97VZXF/FETthLuO3QCA=
Oz4JYvEPe4VuBVI0HZwOmmLCSKM=
</data>
<key>hash2</key>
<data>
32rUBlwsXX6h1UOCCZA/5qhlOc6Y9tv3DRnJRWIk3HQ=
rxlVBlrVOxhuUcePJ+/6QPR9gT1nUnhGwxT4qgQtN9o=
</data>
</dict>
<key>DiagnosticUploadViewController.nib</key>
<dict>
<key>hash</key>
<data>
LudjMlqZwSVbejkS2Bp+TwgSWLE=
kgSgO2B4X1CnHxoQj8Xy7s8/peA=
</data>
<key>hash2</key>
<data>
BcEGD1rfQOzvIAPAkcT/1U/PgQT1hGr6IFgsfY0OXpw=
2WUuzJFUpZZscfI6TTHuXUqpGwl0wclcSN3Qzzp9BVs=
</data>
</dict>
<key>DiagnosticViewController.nib</key>
<dict>
<key>hash</key>
<data>
S6+xp1BLTkZwa5wn758AVwJGbSE=
yNIwVqhM8XHWr2v95gZRffB5uMQ=
</data>
<key>hash2</key>
<data>
BuuJvpajcXha9x5pBMQw/aeGAlgO8vnGBpEUCUwglD4=
O2qJSQaWxMU7CgijZ35S8pNba7A6bDg8UeVsPdBjV/A=
</data>
</dict>
<key>MTDComplianceViewController.nib</key>
<dict>
<key>hash</key>
<data>
P7SSsJAgKtIKGggVYWyLy2cXefU=
c4Cnyyd4DRTeEBrnj56SyiA0H+I=
</data>
<key>hash2</key>
<data>
rffo/aIWs7UbLG2Uiv0HEfiT4nt6ZWhkAwdqWlBekZY=
YfYYZh+Q4+WeRgeJCYGfWLnVovd9QRNyEKSeBGIJa3A=
</data>
</dict>
<key>MTDComplianceViewControllerUnlistedMTDApp.nib</key>
<dict>
<key>hash</key>
<data>
S4O4K6yN2b41Qze8HjNlF2aQHjw=
e1ScPjuMUZW0WjR4R5cEdVVpZ5s=
</data>
<key>hash2</key>
<data>
2zhYEAa2kqRGeSA8o9CPxVc0QPq27M2EJrbYAij5ieo=
tWRp2wi9hPoCqQJbzNgg0XRNmbnw7K/9C7fhwXg/G6g=
</data>
</dict>
<key>MessageViewController.nib</key>
Expand Down
Binary file modified IntuneMAMResources.bundle/_CodeSignature/CodeSignature
Binary file not shown.
10 changes: 5 additions & 5 deletions IntuneMAMStatic.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@
<key>BinaryPath</key>
<string>IntuneMAMSwift.framework/IntuneMAMSwift</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>IntuneMAMSwift.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>IntuneMAMSwift.framework/IntuneMAMSwift</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>IntuneMAMSwift.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if 0
#elif defined(__arm64__) && __arm64__
// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
// Generated by Apple Swift version 6.0 effective-5.10 (swiftlang-6.0.0.9.10 clang-1600.0.26.2)
#ifndef INTUNEMAMSWIFT_SWIFT_H
#define INTUNEMAMSWIFT_SWIFT_H
#pragma clang diagnostic push
Expand Down Expand Up @@ -42,6 +42,8 @@
#include <string.h>
#endif
#if defined(__cplusplus)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-modular-include-in-framework-module"
#if defined(__arm64e__) && __has_include(<ptrauth.h>)
# include <ptrauth.h>
#else
Expand All @@ -55,6 +57,7 @@
# endif
#pragma clang diagnostic pop
#endif
#pragma clang diagnostic pop
#endif

#if !defined(SWIFT_TYPEDEFS)
Expand Down Expand Up @@ -288,6 +291,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wnullability"
#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"

#if __has_attribute(external_source_symbol)
# pragma push_macro("any")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ __attribute__((visibility("default")))

+ (IntuneMAMAppConfigManager*_Nonnull) instance;

// Returns an object that can be used to retrieve Application Configuration
// settings sent from the MAM service/MDM channel for the specified identity.
// Note: For any MDM settings to be returned the given identity must be the identity of the MDM enrolled user
-(id <IntuneMAMAppConfig> _Nonnull) appConfigForIdentity:(NSString*_Nullable)identity DEPRECATED_MSG_ATTRIBUTE("Use appConfigForAccountId: instead.");

// Returns an object that can be used to retrieve Application Configuration
// settings sent from the MAM service/MDM channel for the specified Entra object ID.
// Note: For any MDM settings to be returned the given AccountId (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822) must be the AccountId of the MDM enrolled user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,19 @@ __attribute__((visibility("default")))

+(IntuneMAMCertificatePinningManager* _Nonnull) instance;

// Validates the certificate chain for the specified NSURLAuthenticationChallenge. Returns TRUE if the certificate chain matches the
// expected one for the host and identity or if no pins are provided for the host or identity. If FALSE is returned, the
// certificate chain does not match the expected chain and the application should block the request. If nil is passed in for the
// identity, the current thread identity is used to perform the certificate pinning validation.
- (BOOL) validateChainWithChallenge:(NSURLAuthenticationChallenge* _Nonnull)challenge andIdentity:(NSString* _Nullable)identity error:(NSError* _Nullable* _Nullable)error DEPRECATED_MSG_ATTRIBUTE("Use validateChainWithChallenge:andAccountId:error: instead.");

// Validates the certificate chain for the specified NSURLAuthenticationChallenge. Returns TRUE if the certificate chain matches the
// expected one for the host and Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822) or if no pins are provided for the host or Entra object ID. If FALSE is returned, the
// certificate chain does not match the expected chain and the application should block the request. If nil is passed in for the
// AccountId, the current thread identity is used to perform the certificate pinning validation.
- (BOOL) validateChainWithChallenge:(NSURLAuthenticationChallenge* _Nonnull)challenge andAccountId:(NSString* _Nullable)accountId error:(NSError* _Nullable* _Nullable)error;

// Validates the certificate chain for the specified cert chain and host. Returns TRUE if the certificate chain matches an expected
// one for the host and identity or if no pins are provided for the host or identity. If FALSE is returned, the certificate
// chain does not match the expected chain and the application should block the request. The certificate array should include the server
// certificate (at index 0) followed by intermediate certificates and lastly with the root certificate (at index -1).
// If nil is passed in for the identity, the current thread identity is used to perform the certificate pinning validation.
- (BOOL) validateChainWithCertificates:(NSArray<NSData*>* _Nonnull)certificates andHostname:(NSString* _Nonnull)hostname andIdentity:(NSString* _Nullable)identity error:(NSError* _Nullable* _Nullable)error DEPRECATED_MSG_ATTRIBUTE("Use validateChainWithCertificates:andHostname:andAccountId:error: instead.");

// Validates the certificate chain for the specified cert chain and host. Returns TRUE if the certificate chain matches an expected
// one for the host and Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822) or if no pins are provided for the host or Entra object ID. If FALSE is returned, the certificate
// chain does not match the expected chain and the application should block the request. The certificate array should include the server
// certificate (at index 0) followed by intermediate certificates and lastly with the root certificate (at index -1).
// If nil is passed in for the AccountId, the current thread identity is used to perform the certificate pinning validation.
- (BOOL) validateChainWithCertificates:(NSArray<NSData*>* _Nonnull)certificates andHostname:(NSString* _Nonnull)hostname andAccountId:(NSString* _Nullable)accountId error:(NSError* _Nullable* _Nullable)error;

// Shows an alert displaying an error message to the user for certificate pinning validation, indicating that the requested endpoint was blocked. If nil is passed in for the identity, the current thread identity is used. Call this method instead when the certificate validation APIs return false.
- (void) showErrorMessageForIdentity:(NSString* _Nullable)identity withDismissHanlder:(void(^_Nullable)(void))dismissHandler DEPRECATED_MSG_ATTRIBUTE("Use showErrorMessageForAccountId:withDismissHandler: instead.");

// Shows an alert displaying an error message to the user with Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822) for certificate pinning validation, indicating that the requested endpoint was blocked. If nil is passed in for the AccountId, the current thread identity is used. Call this method instead when the certificate validation APIs return false.
- (void) showErrorMessageForAccountId:(NSString* _Nullable)accountId withDismissHandler:(void(^_Nullable)(void))dismissHandler;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,6 @@ typedef NS_ENUM(NSUInteger, IntuneMAMComplianceStatus)
__attribute__((visibility("default")))
@protocol IntuneMAMComplianceDelegate <NSObject>

/**
* This method is called when the Intune SDK has completed compliance remediation for an identity.
* If the identity has not been added to the app and is compliant, it should be added at this time.
* All values of IntuneMAMComplianceStatus will populate the error parameter with a localized error string.
* This method is guarenteed to be called after application:willFinishLaunchingWithOptions:
*
* @warning Delegate methods are not guarenteed to be called on the Main thread.
*
* @param identity The UPN of the identity for which compliance remediation was requested
* @param status The compliance status of identity
* @param errMsg A localized string describing the error encountered if the identity is not compliant.
* @param errTitle A localized title string for the error encountered if the identity is not compliant.
*/
- (void) identity:(NSString*_Nonnull) identity hasComplianceStatus:(IntuneMAMComplianceStatus) status withErrorMessage:(NSString*_Nonnull) errMsg andErrorTitle:(NSString*_Nonnull) errTitle DEPRECATED_MSG_ATTRIBUTE("Use accountId:hasComplianceStatus:withErrorMessage:andErrorTitle: instead.");

@optional
/**
* This method is called when the Intune SDK has completed compliance remediation for an identity.
* If the identity has not been added to the app and is compliant, it should be added at this time.
Expand Down Expand Up @@ -77,15 +61,6 @@ __attribute__((visibility("default")))
* In this case, the Intune SDK will take UI control at next application launch and call the delegate method identity:hasComplianceStatus:withErrorString: when finished
* If the app knows this is a first time login for identity, it's recomended to set silent to NO as this will likely cause a restart
*
* @param identity The UPN of the identity sending the request
* @param silent A bool indicating whether or not the Intune SDK will take UI control for the duration of the this method
*/
- (void) remediateComplianceForIdentity:(NSString*_Nonnull) identity silent:(BOOL) silent DEPRECATED_MSG_ATTRIBUTE("Use remediateComplianceForAccountId:silent: instead.");

// Returns TRUE if a compliance remediation is in progress for the specified user.
- (BOOL) remediationInProgressForIdentity:(NSString*_Nonnull) identity DEPRECATED_MSG_ATTRIBUTE("Use remediationInProgressForAccountId: instead.");

/**
* @param accountId The The Entra object ID of the identity sending the request (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
* @param silent A bool indicating whether or not the Intune SDK will take UI control for the duration of the this method
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ __attribute__((visibility("default")))

@required

// UPN of the data's owner (e.g. user@contoso.com)
@property (readonly,nullable) NSString* identity DEPRECATED_MSG_ATTRIBUTE("Use accountId instead.");
// Entra object ID of the data owner (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
@property (readonly,nullable) NSString* accountId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,19 @@ __attribute__((visibility("default")))

+ (IntuneMAMDataProtectionManager*_Nonnull) instance;

// Protects the buffer using the policy associated with the specified identity.
// Returns nil if an error occurs.
- (NSData*_Nullable) protect:(NSData*_Nonnull)data identity:(NSString*_Nonnull)identity DEPRECATED_MSG_ATTRIBUTE("Use protect:accountId: instead.");

// Protects the buffer using the policy associated with the specified Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
// Returns nil if an error occurs.
- (NSData*_Nullable) protect:(NSData*_Nonnull)data accountId:(NSString*_Nonnull)accountId;

// Protects the buffer using the policy associated with the specified identity.
// Populates an NSError object and returns nil if an error occurs.
- (NSData*_Nullable) protect:(NSData*_Nonnull)data identity:(NSString*_Nonnull)identity withError:(NSError * _Nullable * _Nullable)error DEPRECATED_MSG_ATTRIBUTE("Use protect:accountId:withError: instead.");

// Protects the buffer using the policy associated with the specified Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
// Populates an NSError object and returns nil if an error occurs.
- (NSData*_Nullable) protect:(NSData*_Nonnull)data accountId:(NSString*_Nonnull)accountId withError:(NSError * _Nullable * _Nullable)error;

// Protects the string using the policy associated with the specified identity.
// Returns a base64 encoded encrypted buffer.
// Returns nil if an error occurs.
- (NSString*_Nullable) protectString:(NSString*_Nonnull)string identity:(NSString*_Nonnull)identity DEPRECATED_MSG_ATTRIBUTE("Use protectString:accountId: instead.");

// Protects the string using the policy associated with the specified Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
// Returns a base64 encoded encrypted buffer.
// Returns nil if an error occurs.
- (NSString*_Nullable) protectString:(NSString*_Nonnull)string accountId:(NSString*_Nonnull)accountId;

// Protects the string using the policy associated with the specified identity.
// Returns a base64 encoded encrypted buffer.
// Populates an NSError object and returns nil if an error occurs.
- (NSString*_Nullable) protectString:(NSString*_Nonnull)string identity:(NSString*_Nonnull)identity withError:(NSError * _Nullable * _Nullable)error DEPRECATED_MSG_ATTRIBUTE("Use protectString:accountId:withError: instead.");

// Protects the string using the policy associated with the specified Entra object ID (e.g. 3ec2c00f-b125-4519-acf0-302ac3761822).
// Returns a base64 encoded encrypted buffer.
// Populates an NSError object and returns nil if an error occurs.
Expand Down
Loading

0 comments on commit b8f29e3

Please sign in to comment.