<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117895] trunk/dports/security/certsync</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117895">117895</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2014-03-16 09:53:32 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Validate self-trust of certificates prior to export.
This handles the case where the certificate, though trusted, will not actually be useable for validation; eg, the certificate is expired.
Issue: #42718</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritycertsyncPortfile">trunk/dports/security/certsync/Portfile</a></li>
<li><a href="#trunkdportssecuritycertsyncfilescertsyncm">trunk/dports/security/certsync/files/certsync.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritycertsyncPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/certsync/Portfile (117894 => 117895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/certsync/Portfile 2014-03-16 16:36:45 UTC (rev 117894)
+++ trunk/dports/security/certsync/Portfile 2014-03-16 16:53:32 UTC (rev 117895)
</span><span class="lines">@@ -3,8 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name certsync
</span><del>-version 1.0.6
-revision 3
</del><ins>+version 1.0.7
</ins><span class="cx"> categories security
</span><span class="cx"> conflicts curl-ca-bundle
</span><span class="cx"> maintainers landonf openmaintainer
</span></span></pre></div>
<a id="trunkdportssecuritycertsyncfilescertsyncm"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/certsync/files/certsync.m (117894 => 117895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/certsync/files/certsync.m 2014-03-16 16:36:45 UTC (rev 117894)
+++ trunk/dports/security/certsync/files/certsync.m 2014-03-16 16:53:32 UTC (rev 117895)
</span><span class="lines">@@ -96,6 +96,60 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Verify that the root certificate trusts itself; this filters out certificates that
+ * are still marked as trusted by the OS, but are expired or otherwise unusable.
+ */
+static BOOL ValidateSelfTrust (SecCertificateRef cert) {
+ OSStatus err;
+
+ /* Create a new trust evaluation instance */
+ SecTrustRef trust;
+ {
+ SecPolicyRef policy = SecPolicyCreateBasicX509();
+ if ((err = SecTrustCreateWithCertificates((CFTypeRef)cert, policy, &trust)) != errSecSuccess) {
+ /* Shouldn't happen */
+ nsfprintf(stderr, @"Failed to create SecTrustRef: %d\n", err);
+ CFRelease(policy);
+ return NO;
+ }
+ CFRelease(policy);
+ }
+
+ /* Set this certificate as the only (self-)anchor */
+ {
+ CFArrayRef certs = CFArrayCreate(NULL, (const void **) &cert, 1, &kCFTypeArrayCallBacks);
+ if ((err = SecTrustSetAnchorCertificates(trust, certs)) != errSecSuccess) {
+ nsfprintf(stderr, @"Failed to set anchor certificates on our SecTrustRef: %d\n", err);
+ CFRelease(certs);
+ CFRelease(trust);
+ return NO;
+ }
+ CFRelease(certs);
+ }
+
+ /* Evaluate the certificate trust */
+ SecTrustResultType rt;
+ if ((err = SecTrustEvaluate(trust, &rt)) != errSecSuccess) {
+ nsfprintf(stderr, @"SecTrustEvaluate() failed: %d\n", err);
+ CFRelease(trust);
+ }
+
+ CFRelease(trust);
+
+ /* Check the result */
+ switch (rt) {
+ case kSecTrustResultUnspecified:
+ case kSecTrustResultProceed:
+ /* Trusted */
+ return YES;
+
+ default:
+ /* Untrusted */
+ return NO;
+ }
+}
+
+/**
</ins><span class="cx"> * Fetch all trusted roots for the given @a domain.
</span><span class="cx"> *
</span><span class="cx"> * @param domain The trust domain to query.
</span><span class="lines">@@ -105,7 +159,7 @@
</span><span class="cx"> */
</span><span class="cx"> static NSArray *certificatesForTrustDomain (SecTrustSettingsDomain domain, NSError **outError) {
</span><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><del>- NSArray *trusted = nil;
</del><ins>+ NSMutableArray *trusted = nil;
</ins><span class="cx"> CFArrayRef certs = nil;
</span><span class="cx"> OSStatus err;
</span><span class="cx">
</span><span class="lines">@@ -131,8 +185,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Extract trusted roots */
</span><del>- NSMutableArray *results = [NSMutableArray arrayWithCapacity: CFArrayGetCount(certs)];
- trusted = results;
</del><ins>+ trusted = [NSMutableArray arrayWithCapacity: CFArrayGetCount(certs)];
</ins><span class="cx">
</span><span class="cx"> NSEnumerator *resultEnumerator = [(NSArray *)certs objectEnumerator];
</span><span class="cx"> id certObj;
</span><span class="lines">@@ -152,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> /* If empty, trust for everything (as per the Security Framework documentation) */
</span><span class="cx"> if (CFArrayGetCount(trustSettings) == 0) {
</span><del>- [results addObject: certObj];
</del><ins>+ [trusted addObject: certObj];
</ins><span class="cx"> } else {
</span><span class="cx"> /* Otherwise, walk the properties and evaluate the trust settings result */
</span><span class="cx"> NSEnumerator *trustEnumerator = [(NSArray *)trustSettings objectEnumerator];
</span><span class="lines">@@ -166,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> /* If a root, add to the result set */
</span><span class="cx"> if (settingsResult == kSecTrustSettingsResultTrustRoot || settingsResult == kSecTrustSettingsResultTrustAsRoot) {
</span><del>- [results addObject: certObj];
</del><ins>+ [trusted addObject: certObj];
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -192,9 +245,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* All certs are trusted */
</span><del>- trusted = (NSArray *) certs;
</del><ins>+ trusted = [[(NSArray *) certs mutableCopy] autorelease];
+ CFRelease(certs);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /*
+ * Filter out any trusted certificates that can not actually be used in verification; eg, they are expired.
+ *
+ * There are cases where CAs have issued new certificates using identical public keys, and the expired
+ * and current CA certificates are both included in the list of trusted certificates. In such a case,
+ * OpenSSL will use either of the two certificates; if that happens to be the expired certificate,
+ * validation will fail.
+ *
+ * This step ensures that we exclude any expired or known-unusable certificates.
+ *
+ * We enumerate a copy of the array so that we can safely modify the original during enumeration.
+ */
+ NSEnumerator *trustedEnumerator = [[[trusted copy] autorelease] objectEnumerator];
+ id certObj;
+ while ((certObj = [trustedEnumerator nextObject]) != nil) {
+ /* If self-trust validation fails, the certificate is expired or otherwise not useable */
+ if (!ValidateSelfTrust((SecCertificateRef) certObj)) {
+ [trusted removeObject: certObj];
+ }
+ }
+
</ins><span class="cx"> [trusted retain];
</span><span class="cx"> [pool release];
</span><span class="cx"> return [trusted autorelease];
</span></span></pre>
</div>
</div>
</body>
</html>