Changeset b0d40f5

Timestamp:

2008-04-30T23:57:49Z (17 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.

Location:

skype

Files:

• README (modified) (2 diffs)
• skyped.py (modified) (2 diffs)

skype/README

@@ -35 +35 @@
 * PyGObject >= 2.8.0. Older versions are part of PyGTK. (And you don't want to
   install GTK for nothing, right?)
+* pyopenssl or python-gnutls.
 
 `bitlbee-skype` has been tested under Linux and Mac OS X. Skype and Skype4py is
@@ -112 +113 @@
 NOTE: Maybe you want to adjust the permissions in the `/usr/local/etc/skyped`
 dir. For example make it readable by just your user.
+
+- If both pyopenssl and python-gnutls are available, then python-gnutls
+  will be used. This behaviour can be overwritten by:
+
+----
+$ export SKYPED_NO_GNUTLS=1
+----
 
 - Start `skyped` (the tcp server):

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)