From 43e57f3911964813794525cb9d4e9375d4294aed Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Wed, 8 Dec 2010 10:19:08 +0000
Subject: [PATCH] r332 | jonas | 2010-12-08 11:18:24 +0100 (Wed, 08 Dec 2010) |
 3 lines

  * enable parts of Security framwork for iOS because newer iOS SDK versions
    depend on them

git-svn-id: trunk@16520 -
---
 packages/univint/src/SecBase.pas  | 6 +-----
 packages/univint/src/SecTrust.pas | 8 +++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/univint/src/SecBase.pas b/packages/univint/src/SecBase.pas
index 54649c5e20..5e3b848573 100644
--- a/packages/univint/src/SecBase.pas
+++ b/packages/univint/src/SecBase.pas
@@ -186,9 +186,7 @@ uses MacTypes,CFBase;
 {$endc} {not MACOSALLINCLUDE}
 
 
-{$ifc TARGET_OS_MAC}
-
-{$ifc TARGET_CPU_64}
+{$ifc TARGET_CPU_64 or TARGET_CPU_ARM}
 {$packrecords C}
 {$elsec}
 {$ALIGN POWER}
@@ -478,8 +476,6 @@ const
 	errSecPkcs12VerifyFailure = -25264;	{ MAC verification failed during PKCS12 Import. }
 	
 	errSecDecode = -26275;  { Unable to decode the provided data. }
-
-{$endc} {TARGET_OS_MAC}
 {$ifc not defined MACOSALLINCLUDE or not MACOSALLINCLUDE}
 
 end.
diff --git a/packages/univint/src/SecTrust.pas b/packages/univint/src/SecTrust.pas
index 332a1a14aa..523f539347 100644
--- a/packages/univint/src/SecTrust.pas
+++ b/packages/univint/src/SecTrust.pas
@@ -186,8 +186,6 @@ uses MacTypes,SecBase,cssmtype,cssmapple,CFBase,CFArray,CFData,CFDate;
 {$endc} {not MACOSALLINCLUDE}
 
 
-{$ifc TARGET_OS_MAC}
-
 {!
 	@header SecTrust
 	The functions and data types in SecTrust implement trust computation and allow the user to apply trust decisions to the trust configuration.
@@ -261,6 +259,7 @@ function SecTrustCreateWithCertificates( certificates: CFArrayRef; policies: CFT
 }    
 function SecTrustSetPolicies( trust: SecTrustRef; policies: CFTypeRef ): OSStatus; external name '_SecTrustSetPolicies';
 
+{$ifc TARGET_OS_MAC}
 {!
 	@function SecTrustSetParameters
 	@abstract Sets the action and action data for a trust.
@@ -270,6 +269,7 @@ function SecTrustSetPolicies( trust: SecTrustRef; policies: CFTypeRef ): OSStatu
 	@result A result code. See "Security Error Codes" (SecBase.h).
  }
 function SecTrustSetParameters( trustRef: SecTrustRef; action: CSSM_TP_ACTION; actionData: CFDataRef ): OSStatus; external name '_SecTrustSetParameters';
+{$endc} {TARGET_OS_MAC}
 
 {!
 	@function SecTrustSetAnchorCertificates
@@ -328,6 +328,7 @@ function SecTrustGetVerifyTime( trust: SecTrustRef ): CFAbsoluteTime; external n
 }
 function SecTrustEvaluate( trust: SecTrustRef; var result: SecTrustResultType ): OSStatus; external name '_SecTrustEvaluate';
 
+{$ifc TARGET_OS_MAC}
 {!
 	@function SecTrustGetResult
 	@abstract Returns detail information on the outcome of a call to SecTrustEvaluate.
@@ -365,6 +366,7 @@ function SecTrustGetCssmResultCode( trust: SecTrustRef; var resultCode: OSStatus
 	@result A result code. See "Security Error Codes" (SecBase.h).
 }
 function SecTrustGetTPHandle( trust: SecTrustRef; var handle: CSSM_TP_HANDLE ): OSStatus; external name '_SecTrustGetTPHandle';
+{$endc} {TARGET_OS_MAC}
 
 {!
     @function SecTrustCopyPolicies
@@ -393,6 +395,7 @@ function SecTrustCopyCustomAnchorCertificates( trust: SecTrustRef; var anchors:
 }
 function SecTrustCopyAnchorCertificates( var anchors: CFArrayRef ): OSStatus; external name '_SecTrustCopyAnchorCertificates';
 
+{$ifc TARGET_OS_MAC}
 {!
 	@function SecTrustGetCSSMAnchorCertificates
 	@abstract Retrieves the CSSM anchor certificates.
@@ -429,7 +432,6 @@ function SecTrustGetUserTrust( certificate: SecCertificateRef; policy: SecPolicy
 }
 function SecTrustSetUserTrust( certificate: SecCertificateRef; policy: SecPolicyRef; trustSetting: SecTrustUserSetting ): OSStatus; external name '_SecTrustSetUserTrust';
 (* DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER *)
-
 {$endc} {TARGET_OS_MAC}
 {$ifc not defined MACOSALLINCLUDE or not MACOSALLINCLUDE}