Changeset c7000bb for skype/skyped.py

Timestamp:

2010-12-11T15:14:12Z (14 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.

File:

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

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: