<!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>[15225] PySecureTransport/trunk/OpenSSL/crypto.py</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="http://trac.calendarserver.org//changeset/15225">15225</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-24 09:00:50 -0700 (Sat, 24 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API to check ability of Keychain identity to sign data (checks whether access to private key is allowed).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PySecureTransporttrunkOpenSSLcryptopy">PySecureTransport/trunk/OpenSSL/crypto.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PySecureTransporttrunkOpenSSLcryptopy"></a>
<div class="modfile"><h4>Modified: PySecureTransport/trunk/OpenSSL/crypto.py (15224 => 15225)</h4>
<pre class="diff"><span>
<span class="info">--- PySecureTransport/trunk/OpenSSL/crypto.py        2015-10-24 15:59:10 UTC (rev 15224)
+++ PySecureTransport/trunk/OpenSSL/crypto.py        2015-10-24 16:00:50 UTC (rev 15225)
</span><span class="lines">@@ -317,22 +317,74 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def load_keychain_identity(subject):
</del><ins>+def check_keychain_identity(identity):
</ins><span class="cx"> """
</span><del>- Retrieve a SecIdentityRef from the KeyChain with a subject that exactly matches the passed in value.
</del><ins>+ Verify that the Keychain identity exists and that the private key is accessible.
</ins><span class="cx">
</span><del>- @param subject: subject value to match
- @type subject: L{str}
</del><ins>+ @param identity: identity value to match
+ @type identity: L{str}
</ins><span class="cx">
</span><ins>+ @return: empty L{str} if OK, error message if not
+ @rtype: L{str}
+ """
+
+ # Always turn off user interaction
+ security.SecKeychainSetUserInteractionAllowed(False)
+
+ try:
+ secidentity = load_keychain_identity(identity)
+ except Error:
+ return "Unable to load Keychain identity: {}".format(identity)
+ pkey = ffi.new("SecKeyRef *")
+ err = security.SecIdentityCopyPrivateKey(secidentity.ref(), pkey)
+ if err != 0:
+ return "Unable to load private key for Keychain identity: {}".format(identity)
+ pkey = CFObjectRef(pkey[0])
+
+ # Try to sign some data with the pkey to check we have access
+ error = ffi.new("CFErrorRef *")
+ signer = security.SecSignTransformCreate(pkey.ref(), error)
+ if error[0] != ffi.NULL:
+ cferror = CFErrorRef(error[0])
+ return "Unable to use private key for Keychain identity: {} - {}".format(identity, cferror.description())
+ signer = CFObjectRef(signer)
+
+ signMe = CFDataRef.fromString("sign me")
+ security.SecTransformSetAttribute(
+ signer.ref(),
+ security.kSecTransformInputAttributeName,
+ signMe.ref(),
+ error
+ )
+ if error[0] != ffi.NULL:
+ cferror = CFErrorRef(error[0])
+ return "Unable to use private key for Keychain identity: {} - {}".format(identity, cferror.description())
+
+ signature = security.SecTransformExecute(signer.ref(), error)
+ if error[0] != ffi.NULL or signature == ffi.NULL:
+ cferror = CFErrorRef(error[0])
+ return "Unable to use private key for Keychain identity: {} - {}".format(identity, cferror.description())
+
+ return ""
+
+
+
+def load_keychain_identity(identity):
+ """
+ Retrieve a SecIdentityRef from the KeyChain with a identity that exactly matches the passed in value.
+
+ @param identity: identity value to match
+ @type identity: L{str}
+
</ins><span class="cx"> @return: matched SecIdentityRef item or L{None}
</span><span class="cx"> @rtype: L{CFObjectRef}
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # First try to load this from an identity preference
</span><del>- cfsubject = CFStringRef.fromString(subject)
- identity = security.SecIdentityCopyPreferred(cfsubject.ref(), ffi.NULL, ffi.NULL)
- if identity != ffi.NULL:
- return CFObjectRef(identity)
</del><ins>+ cfsubject = CFStringRef.fromString(identity)
+ secidentity = security.SecIdentityCopyPreferred(cfsubject.ref(), ffi.NULL, ffi.NULL)
+ if secidentity != ffi.NULL:
+ return CFObjectRef(secidentity)
</ins><span class="cx">
</span><span class="cx"> # Now iterate items to find a match
</span><span class="cx"> match = CFDictionaryRef.fromDict({
</span><span class="lines">@@ -351,10 +403,10 @@
</span><span class="cx">
</span><span class="cx"> result = CFArrayRef(result[0])
</span><span class="cx"> for item in result.toList():
</span><del>- if item[str(CFStringRef.fromRef(security.kSecAttrLabel))] == subject:
- identity = item[str(CFStringRef.fromRef(security.kSecValueRef))]
</del><ins>+ if item[str(CFStringRef.fromRef(security.kSecAttrLabel))] == identity:
+ secidentity = item[str(CFStringRef.fromRef(security.kSecValueRef))]
</ins><span class="cx"> break
</span><span class="cx"> else:
</span><del>- raise Error("Certificate with id '{}' was not found in the KeyChain".format(subject))
</del><ins>+ raise Error("Could not find Keychain identity: {}".format(identity))
</ins><span class="cx">
</span><del>- return identity
</del><ins>+ return secidentity
</ins></span></pre>
</div>
</div>
</body>
</html>