Changeset c7000bb

Timestamp:

2010-12-11T15:14:12Z (13 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

0b77a9b

Parents:

35249d6

Message:

Use internal ssl module instead of pyopenssl or python-gnutls

This results in shorter code and is available on Windows as well.

Location:

skype

Files:

• README (modified) (4 diffs)
• skyped.py (modified) (3 diffs)

skype/README

@@ -41 +41 @@
 * 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
@@ -90 +89 @@
 ----
 
-and you have to install `bitlbee-skype`, `skype4py` and `python-gnutls` from
+and you have to install `bitlbee-skype` and `skype4py` from
 source.
 
@@ -124 +123 @@
 $ cd Skype4Py-x.x.x.x
 # python setup.py install
-----
-
-- To install http://pypi.python.org/pypi/python-gnutls[python-gnutls] from source
-  (unless you want to install the plugin for a public server):
-
-----
-$ tar -zxvf python-gnutls-x.x.x.tar.gz
-$ cd python-gnutls-x.x.x
-# python setup.py install
-----
-
-NOTE: On OS X you will need the following hacks first:
-
-----
-$ export LD_LIBRARY_PATH=/opt/local/lib
-$ export CFLAGS="-I/opt/local/include"
-$ export LDFLAGS="-L/opt/local/lib"
 ----
 
@@ -191 +173 @@
 http://code.google.com/p/gdata-python-client/source/browse/src/gdata/oauth/rsa.py#87[here].
 
-- 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

@@ -33 +33 @@
 from ConfigParser import ConfigParser, NoOptionError
 from traceback import print_exception
+import ssl
 
 __version__ = "0.1.1"
@@ -86 +87 @@
 def server(host, port):
         global options
-        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 = socket.socket()
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
@@ -108 +95 @@
 def listener(sock, *args):
         global options
-        options.conn, addr = sock.accept()
+        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)
         if hasattr(options.conn, 'handshake'):
                 try: