[CalendarServer-changes] [15554] PySecureTransport/trunk/OpenSSL/crypto.py

[source_changes at macosforge.org]

Revision: 15554
          http://trac.calendarserver.org//changeset/15554
Author:   cdaboo at apple.com
Date:     2016-04-26 06:51:49 -0700 (Tue, 26 Apr 2016)
Log Message:
-----------
Allow user interaction when checking keychain so that acls can be applied if needed.

Modified Paths:
--------------
    PySecureTransport/trunk/OpenSSL/crypto.py

Modified: PySecureTransport/trunk/OpenSSL/crypto.py
===================================================================
--- PySecureTransport/trunk/OpenSSL/crypto.py	2016-04-26 01:17:01 UTC (rev 15553)
+++ PySecureTransport/trunk/OpenSSL/crypto.py	2016-04-26 13:51:49 UTC (rev 15554)
@@ -317,7 +317,7 @@
 
 
 
-def check_keychain_identity(identity):
+def check_keychain_identity(identity, allowInteraction=False):
     """
     Verify that the Keychain identity exists and that the private key is accessible.
 
@@ -329,7 +329,7 @@
     """
 
     # Always turn off user interaction
-    security.SecKeychainSetUserInteractionAllowed(False)
+    security.SecKeychainSetUserInteractionAllowed(allowInteraction)
 
     try:
         secidentity = load_keychain_identity(identity)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160426/d283bd27/attachment.html>