[CalendarServer-changes] [2063] CalendarServer/branches/getsslpassphrase/twistedcaldav/tap.py

[source_changes at macosforge.org]

Revision: 2063
          http://trac.macosforge.org/projects/calendarserver/changeset/2063
Author:   dreid at apple.com
Date:     2007-12-11 13:19:46 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
Add support for guessing the private key type of PEM encoded keys.  Ignoring ASN.1 for now.

Modified Paths:
--------------
    CalendarServer/branches/getsslpassphrase/twistedcaldav/tap.py

Modified: CalendarServer/branches/getsslpassphrase/twistedcaldav/tap.py
===================================================================
--- CalendarServer/branches/getsslpassphrase/twistedcaldav/tap.py	2007-12-11 17:04:01 UTC (rev 2062)
+++ CalendarServer/branches/getsslpassphrase/twistedcaldav/tap.py	2007-12-11 21:19:46 UTC (rev 2063)
@@ -312,10 +312,29 @@
 from twisted.internet.ssl import DefaultOpenSSLContextFactory
 
 def _getSSLPassphrase(*args):
+    sslPrivKey = open(config.SSLPrivateKey)
+
+    type = None
+    for line in sslPrivKey.readlines():
+        if '-----BEGIN RSA PRIVATE KEY-----' in line:
+            type = 'RSA'
+            break
+        elif '-----BEGIN DSA PRIVATE KEY-----' in line:
+            type = 'DSA'
+            break
+
+    sslPrivKey.close()
+
+    if type is None:
+        logging.err('Could not get private key type for %s' % (
+                config.SSLPrivateKey,))
+        return False
+
     import commands
-    return commands.getoutput("%s %s:%s DSA" % (config.SSLPassPhraseDialog,
-                                                config.ServerHostName,
-                                                config.SSLPort))
+    return commands.getoutput("%s %s:%s %s" % (config.SSLPassPhraseDialog,
+                                               config.ServerHostName,
+                                               config.SSLPort,
+                                               type))
 
 
 class ChainingOpenSSLContextFactory(DefaultOpenSSLContextFactory):

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071211/5a2063eb/attachment.html