[CalendarServer-changes] [15261] twext/trunk/twext/internet/ssl.py

[source_changes at macosforge.org]

Revision: 15261
          http://trac.calendarserver.org//changeset/15261
Author:   cdaboo at apple.com
Date:     2015-10-30 13:59:03 -0700 (Fri, 30 Oct 2015)
Log Message:
-----------
Fix for client-side openssl use.

Modified Paths:
--------------
    twext/trunk/twext/internet/ssl.py

Modified: twext/trunk/twext/internet/ssl.py
===================================================================
--- twext/trunk/twext/internet/ssl.py	2015-10-30 17:46:20 UTC (rev 15260)
+++ twext/trunk/twext/internet/ssl.py	2015-10-30 20:59:03 UTC (rev 15261)
@@ -83,9 +83,10 @@
         if self.keychainIdentity and hasattr(ctx, "use_keychain_identity"):
             ctx.use_keychain_identity(self.keychainIdentity)
         else:
-            ctx.use_certificate_file(self.certificateFileName)
-            ctx.use_privatekey_file(self.privateKeyFileName)
-
+            if self.certificateFileName:
+                ctx.use_certificate_file(self.certificateFileName)
+            if self.privateKeyFileName:
+                ctx.use_privatekey_file(self.privateKeyFileName)
             if self.certificateChainFile:
                 ctx.use_certificate_chain_file(self.certificateChainFile)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151030/067ed5e5/attachment.html>