Security-55471.14.18.tar.gz

[apple/security.git] / libsecurity_keychain / lib / SecTrust.cpp

diff --git a/libsecurity_keychain/lib/SecTrust.cpp b/libsecurity_keychain/lib/SecTrust.cpp
index 297b76d7809df5cb4df25e7f3355c4bcdbdeb23a..efdb501f6be45d232d9fd436c4286c84a1644069 100644 (file)
--- a/libsecurity_keychain/lib/SecTrust.cpp
+++ b/libsecurity_keychain/lib/SecTrust.cpp
@@ -402,10 +402,22 @@ SecKeyRef SecTrustCopyPublicKey(SecTrustRef trust)
        OSStatus __secapiresult = errSecSuccess;
        try {
                Trust *trustObj = Trust::required(trust);
        OSStatus __secapiresult = errSecSuccess;
        try {
                Trust *trustObj = Trust::required(trust);

-               if (trustObj->result() == kSecTrustResultInvalid)
-                       MacOSError::throwMe(errSecTrustNotAvailable);
-               if (trustObj->evidence() == nil)
+               if (trustObj->result() == kSecTrustResultInvalid) {
+                       // Trust hasn't been evaluated; attempt to retrieve public key from leaf.
+                       SecCertificateRef cert = SecTrustGetCertificateAtIndex(trust, 0);
+                       __secapiresult = SecCertificateCopyPublicKey(cert, &pubKey);
+                       if (pubKey) {
+                               return pubKey;
+                       }
+                       // Otherwise, we must evaluate first.
+                       trustObj->evaluate();
+                       if (trustObj->result() == kSecTrustResultInvalid) {
+                               MacOSError::throwMe(errSecTrustNotAvailable);
+                       }
+               }
+               if (trustObj->evidence() == nil) {

                        trustObj->buildEvidence(certChain, TPEvidenceInfo::overlayVar(statusChain));
                        trustObj->buildEvidence(certChain, TPEvidenceInfo::overlayVar(statusChain));

+               }

                evidenceChain = trustObj->evidence();
        }
        catch (const MacOSError &err) { __secapiresult=err.osStatus(); }
                evidenceChain = trustObj->evidence();
        }
        catch (const MacOSError &err) { __secapiresult=err.osStatus(); }


@@ -470,12 +482,27 @@ SecCertificateRef SecTrustGetCertificateAtIndex(SecTrustRef trust, CFIndex ix)
        try {
                Trust *trustObj = Trust::required(trust);
                if (trustObj->result() == kSecTrustResultInvalid) {
        try {
                Trust *trustObj = Trust::required(trust);
                if (trustObj->result() == kSecTrustResultInvalid) {

+                       // If caller is asking for the leaf, we can return it without
+                       // having to evaluate the entire chain. Note that we don't retain
+                       // the cert as it's owned by the trust and this is a 'Get' API.
+                       if (ix == 0) {
+                               CFArrayRef certs = trustObj->certificates();
+                               if (certs && (CFArrayGetCount(certs) > 0)) {
+                                       certificate = (SecCertificateRef) CFArrayGetValueAtIndex(certs, 0);
+                                       if (certificate) {
+                                               return certificate;
+                                       }
+                               }
+                       }
+                       // Otherwise, we must evaluate first.

                        trustObj->evaluate();
                        trustObj->evaluate();

-                       if (trustObj->result() == kSecTrustResultInvalid)
+                       if (trustObj->result() == kSecTrustResultInvalid) {

                                MacOSError::throwMe(errSecTrustNotAvailable);
                                MacOSError::throwMe(errSecTrustNotAvailable);

+                       }

                }
                }

-               if (trustObj->evidence() == nil)
+               if (trustObj->evidence() == nil) {

                        trustObj->buildEvidence(certChain, TPEvidenceInfo::overlayVar(statusChain));
                        trustObj->buildEvidence(certChain, TPEvidenceInfo::overlayVar(statusChain));

+               }

                evidenceChain = trustObj->evidence();
        }
        catch (const MacOSError &err) { __secapiresult=err.osStatus(); }
                evidenceChain = trustObj->evidence();
        }
        catch (const MacOSError &err) { __secapiresult=err.osStatus(); }