X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/6b200bc335dc93c5516ccb52f14bd896d8c7fad7..914fc88e61be54aed6b18205ff2775b48793a3b6:/OSX/sec/Security/SecIdentity.c diff --git a/OSX/sec/Security/SecIdentity.c b/OSX/sec/Security/SecIdentity.c index ed2f9d68..9c33051d 100644 --- a/OSX/sec/Security/SecIdentity.c +++ b/OSX/sec/Security/SecIdentity.c @@ -1,15 +1,15 @@ /* - * Copyright (c) 2002-2004,2007-2008,2010,2012-2014 Apple Inc. All Rights Reserved. - * + * Copyright (c) 2002-2004,2007-2008,2010,2012-2017 Apple Inc. All Rights Reserved. + * * @APPLE_LICENSE_HEADER_START@ - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in * compliance with the License. Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this * file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -17,7 +17,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_LICENSE_HEADER_END@ */ @@ -55,8 +55,8 @@ static CFStringRef SecIdentityCopyFormatDescription(CFTypeRef cf, CFDictionaryRe static void SecIdentityDestroy(CFTypeRef cf) { SecIdentityRef identity = (SecIdentityRef)cf; - CFReleaseSafe(identity->_certificate); - CFReleaseSafe(identity->_privateKey); + CFReleaseNull(identity->_certificate); + CFReleaseNull(identity->_privateKey); } static Boolean SecIdentityCompare(CFTypeRef cf1, CFTypeRef cf2) { @@ -83,7 +83,7 @@ OSStatus SecIdentityCopyCertificate(SecIdentityRef identity, return 0; } -OSStatus SecIdentityCopyPrivateKey(SecIdentityRef identity, +OSStatus SecIdentityCopyPrivateKey(SecIdentityRef identity, SecKeyRef *privateKeyRef) { *privateKeyRef = identity->_privateKey; CFRetain(*privateKeyRef);