Changeset b926d88 for protocols

Timestamp:

2011-12-11T23:26:45Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

17f057d

Parents:

57a6eb5f (diff), 6ba00ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Skype merge.

File:

• protocols/skype/skyped.py (modified) (1 diff)

protocols/skype/skyped.py

@@ -198 +198 @@
                 if not(wait_for_lock(options.lock, 3, 10, "listener")): return False
         rawsock, addr = sock.accept()
-        options.conn = ssl.wrap_socket(rawsock,
-                server_side=True,
-                certfile=options.config.sslcert,
-                keyfile=options.config.sslkey,
-                ssl_version=ssl.PROTOCOL_TLSv1)
+        try:
+                options.conn = ssl.wrap_socket(rawsock,
+                        server_side=True,
+                        certfile=options.config.sslcert,
+                        keyfile=options.config.sslkey,
+                        ssl_version=ssl.PROTOCOL_TLSv1)
+        except ssl.SSLError:
+                dprint("Warning, SSL init failed, did you create your certificate?")
+                return False
         if hasattr(options.conn, 'handshake'):
                 try: