Changeset b0d40f5 for skype/skyped.py

Timestamp:

2008-04-30T23:57:49Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

e3d0b10

Parents:

4c340e9

Message:

add python-gnutls support and make it default if available

• this change in general should be ok, since openssl has problems when using it from gpl software which is distributed as a binary.
• anyway, i hope that this will solve that magic "Fatal Python error: PyEval_RestoreThread: NULL tstate" error. at least it worth a try.

File:

• skype/skyped.py (modified) (2 diffs)

skype/skyped.py

@@ -74 +74 @@
 def server(host, port):
         global options
-
-        from OpenSSL import SSL
-        ctx = SSL.Context(SSL.TLSv1_METHOD)
-        ctx.use_privatekey_file(options.config.sslkey)
-        ctx.use_certificate_file(options.config.sslcert)
-        sock = SSL.Connection(ctx, socket.socket())
-
+        try:
+                if "SKYPED_NO_GNUTLS" in os.environ.keys():
+                        dprint("Warning, using OpenSSL instead of gnutls as requested (not recommended).")
+                        raise ImportError
+                from gnutls import crypto, connection
+                cert = crypto.X509Certificate(open(options.config.sslcert).read())
+                key = crypto.X509PrivateKey(open(options.config.sslkey).read())
+                cred = connection.X509Credentials(cert, key)
+                sock = connection.ServerSessionFactory(socket.socket(), cred)
+        except ImportError:
+                from OpenSSL import SSL
+                ctx = SSL.Context(SSL.TLSv1_METHOD)
+                ctx.use_privatekey_file(options.config.sslkey)
+                ctx.use_certificate_file(options.config.sslcert)
+                sock = SSL.Connection(ctx, socket.socket())
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
@@ -89 +97 @@
         global options
         options.conn, addr = sock.accept()
+        if hasattr(options.conn, 'handshake'):
+                options.conn.handshake()
         ret = 0
         line = options.conn.recv(1024)