From a452851866c8af552a1f09350ebf30227ad450e1 Mon Sep 17 00:00:00 2001 From: Apple Date: Wed, 5 Feb 2003 02:12:40 +0000 Subject: [PATCH] Security-54.1.5.tar.gz --- AppleX509TP/AppleTPSession.h | 1 + AppleX509TP/tpCredRequest.cpp | 5 +-- CertTool/CertTool/CertTool.cpp | 2 +- Security.pbproj/project.pbxproj | 56 ++++++++++++++++----------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/AppleX509TP/AppleTPSession.h b/AppleX509TP/AppleTPSession.h index af986f3d..aabb7012 100644 --- a/AppleX509TP/AppleTPSession.h +++ b/AppleX509TP/AppleTPSession.h @@ -213,6 +213,7 @@ private: void SubmitCsrRequest( const CSSM_TP_REQUEST_SET &RequestInput, + const CSSM_TP_CALLERAUTH_CONTEXT *CallerAuthContext, sint32 &EstimatedTime, CssmData &ReferenceIdentifier); diff --git a/AppleX509TP/tpCredRequest.cpp b/AppleX509TP/tpCredRequest.cpp index 1aeaf4cd..71b6e6f8 100644 --- a/AppleX509TP/tpCredRequest.cpp +++ b/AppleX509TP/tpCredRequest.cpp @@ -424,6 +424,7 @@ CSSM_DATA_PTR AppleTPSession::getCertFromMap( */ void AppleTPSession::SubmitCsrRequest( const CSSM_TP_REQUEST_SET &RequestInput, + const CSSM_TP_CALLERAUTH_CONTEXT *CallerAuthContext, sint32 &EstimatedTime, // RETURNED CssmData &ReferenceIdentifier) // RETURNED { @@ -484,7 +485,7 @@ void AppleTPSession::SubmitCsrRequest( CSSM_RETURN crtn; crtn = CSSM_CSP_CreateSignatureContext(certReq->cspHand, certReq->signatureAlg, - NULL, // AccessCred + (CallerAuthContext ? CallerAuthContext->CallerCredentials : NULL), certReq->issuerPrivateKey, &sigHand); if(crtn) { @@ -574,7 +575,7 @@ void AppleTPSession::SubmitCredRequest( if(tpCompareCssmData(&tpPolicy->PolicyIds->FieldOid, &CSSMOID_APPLE_TP_CSR_GEN)) { /* break out to CSR-specific code */ - SubmitCsrRequest(RequestInput, EstimatedTime, ReferenceIdentifier); + SubmitCsrRequest(RequestInput, CallerAuthContext, EstimatedTime, ReferenceIdentifier); return; } else if(!tpCompareCssmData(&tpPolicy->PolicyIds->FieldOid, diff --git a/CertTool/CertTool/CertTool.cpp b/CertTool/CertTool/CertTool.cpp index ac189b28..a1bda8f7 100644 --- a/CertTool/CertTool/CertTool.cpp +++ b/CertTool/CertTool/CertTool.cpp @@ -90,7 +90,7 @@ #define SEC_CERT_ADD_TO_KC 1 /* SecKeyCreatePair() implemented */ -#define SEC_KEY_CREATE_PAIR 1 +#define SEC_KEY_CREATE_PAIR 0 #if !SEC_KEY_CREATE_PAIR /* munge Label attr if manually generating keys */ diff --git a/Security.pbproj/project.pbxproj b/Security.pbproj/project.pbxproj index aba92d89..3970d28c 100644 --- a/Security.pbproj/project.pbxproj +++ b/Security.pbproj/project.pbxproj @@ -121,7 +121,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\""; HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/BSafe.framework/Headers\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/BSafe.framework/Headers\" \"$(SRCROOT)/AppleCSP\" \"$(SRCROOT)/AppleCSP/open_ssl\""; LIBRARY_STYLE = STATIC; @@ -392,7 +392,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = "-DVDADER_RULES"; @@ -471,7 +471,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = ""; @@ -532,7 +532,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = "-DVDADER_RULES"; @@ -615,7 +615,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = "-DVDADER_RULES"; @@ -7409,7 +7409,7 @@ 01FA8900FFF2BC5611CD283A, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; INSTALL_PATH = "$(SYSTEM_CORE_SERVICES_DIR)"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; @@ -7525,7 +7525,7 @@ 01FA890AFFF2BCA811CD283A, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; INSTALL_PATH = "$(SYSTEM_CORE_SERVICES_DIR)"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; @@ -7874,7 +7874,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; INSTALL_PATH = /usr/local/lib; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; @@ -9189,9 +9189,9 @@ F5DDE3AE00B3358F01CD283A, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = "\"$(SRCROOT)\" \"$(BUILT_PRODUCTS_DIR)/derived_src\""; @@ -9237,11 +9237,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; @@ -10338,7 +10338,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 54.1.3; + DYLIB_CURRENT_VERSION = 54.1.5; HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/include\""; INSTALL_PATH = /usr/local/lib; LIBRARY_STYLE = STATIC; @@ -12108,7 +12108,7 @@ 325EAA2800D6B08805CD296C, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = ""; @@ -12147,11 +12147,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; @@ -12661,7 +12661,7 @@ 3290382100D6BA5905CD296C, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = ""; @@ -12701,11 +12701,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; @@ -12770,7 +12770,7 @@ 3290382700D6BA5905CD296C, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = ""; @@ -12810,11 +12810,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; @@ -12867,7 +12867,7 @@ 3290382D00D6BA5905CD296C, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_CFLAGS = ""; @@ -12907,11 +12907,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; @@ -12964,7 +12964,7 @@ 3290383300D6BA5905CD296C, ); buildSettings = { - CURRENT_PROJECT_VERSION = 54.1.3; + CURRENT_PROJECT_VERSION = 54.1.5; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-Os -DNDEBUG"; OTHER_LDFLAGS = "-bundle -undefined error"; @@ -13002,11 +13002,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 54.1.3 + 54.1.5 "; -- 2.45.2