blob: 9e88073916bd55d2e30e02e0e47167ae61707aed [file] [log] [blame]
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +00001# Wrapper module for _ssl, providing some additional facilities
2# implemented in Python. Written by Bill Janssen.
3
4"""\
5This module provides some more Pythonic support for SSL.
6
7Object types:
8
Bill Janssen98d19da2007-09-10 21:51:02 +00009 SSLSocket -- subtype of socket.socket which does SSL over the socket
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000010
11Exceptions:
12
Bill Janssen98d19da2007-09-10 21:51:02 +000013 SSLError -- exception raised for I/O errors
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000014
15Functions:
16
17 cert_time_to_seconds -- convert time string used for certificate
18 notBefore and notAfter functions to integer
19 seconds past the Epoch (the time values
20 returned from time.time())
21
22 fetch_server_certificate (HOST, PORT) -- fetch the certificate provided
23 by the server running on HOST at port PORT. No
24 validation of the certificate is performed.
25
26Integer constants:
27
28SSL_ERROR_ZERO_RETURN
29SSL_ERROR_WANT_READ
30SSL_ERROR_WANT_WRITE
31SSL_ERROR_WANT_X509_LOOKUP
32SSL_ERROR_SYSCALL
33SSL_ERROR_SSL
34SSL_ERROR_WANT_CONNECT
35
36SSL_ERROR_EOF
37SSL_ERROR_INVALID_ERROR_CODE
38
39The following group define certificate requirements that one side is
40allowing/requiring from the other side:
41
42CERT_NONE - no certificates from the other side are required (or will
43 be looked at if provided)
44CERT_OPTIONAL - certificates are not required, but if provided will be
45 validated, and if validation fails, the connection will
46 also fail
47CERT_REQUIRED - certificates are required, and will be validated, and
48 if validation fails, the connection will also fail
49
50The following constants identify various SSL protocol variants:
51
52PROTOCOL_SSLv2
53PROTOCOL_SSLv3
54PROTOCOL_SSLv23
55PROTOCOL_TLSv1
56"""
57
Christian Heimesc5f05e42008-02-23 17:40:11 +000058import textwrap
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000059
60import _ssl # if we can't import it, let the error propagate
Bill Janssen98d19da2007-09-10 21:51:02 +000061
Antoine Pitrouf9de5342010-04-05 21:35:07 +000062from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION
Bill Janssen98d19da2007-09-10 21:51:02 +000063from _ssl import SSLError
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000064from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
65from _ssl import PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
Bill Janssen98d19da2007-09-10 21:51:02 +000066from _ssl import RAND_status, RAND_egd, RAND_add
Bill Janssen426ea0a2007-08-29 22:35:05 +000067from _ssl import \
68 SSL_ERROR_ZERO_RETURN, \
69 SSL_ERROR_WANT_READ, \
70 SSL_ERROR_WANT_WRITE, \
71 SSL_ERROR_WANT_X509_LOOKUP, \
72 SSL_ERROR_SYSCALL, \
73 SSL_ERROR_SSL, \
74 SSL_ERROR_WANT_CONNECT, \
75 SSL_ERROR_EOF, \
76 SSL_ERROR_INVALID_ERROR_CODE
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000077
Antoine Pitroudfb299b2010-04-23 22:54:59 +000078from socket import socket, _fileobject, _delegate_methods, error as socket_error
Bill Janssen426ea0a2007-08-29 22:35:05 +000079from socket import getnameinfo as _getnameinfo
Bill Janssen296a59d2007-09-16 22:06:00 +000080import base64 # for DER-to-PEM translation
Bill Janssen98d19da2007-09-10 21:51:02 +000081
Ezio Melottib01f5e62010-01-18 09:10:26 +000082class SSLSocket(socket):
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000083
Bill Janssen426ea0a2007-08-29 22:35:05 +000084 """This class implements a subtype of socket.socket that wraps
85 the underlying OS socket in an SSL context when necessary, and
86 provides read and write methods over that channel."""
87
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000088 def __init__(self, sock, keyfile=None, certfile=None,
89 server_side=False, cert_reqs=CERT_NONE,
Bill Janssen934b16d2008-06-28 22:19:33 +000090 ssl_version=PROTOCOL_SSLv23, ca_certs=None,
91 do_handshake_on_connect=True,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +000092 suppress_ragged_eofs=True, ciphers=None):
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +000093 socket.__init__(self, _sock=sock._sock)
Antoine Pitroudfb299b2010-04-23 22:54:59 +000094 # The initializer for socket overrides the methods send(), recv(), etc.
95 # in the instancce, which we don't need -- but we want to provide the
96 # methods defined in SSLSocket.
97 for attr in _delegate_methods:
98 try:
99 delattr(self, attr)
100 except AttributeError:
101 pass
Bill Janssen934b16d2008-06-28 22:19:33 +0000102
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000103 if certfile and not keyfile:
104 keyfile = certfile
Bill Janssen426ea0a2007-08-29 22:35:05 +0000105 # see if it's connected
106 try:
107 socket.getpeername(self)
Benjamin Peterson941db4d2008-12-31 04:08:55 +0000108 except socket_error:
Bill Janssen426ea0a2007-08-29 22:35:05 +0000109 # no, no connection yet
110 self._sslobj = None
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000111 else:
Bill Janssen426ea0a2007-08-29 22:35:05 +0000112 # yes, create the SSL object
113 self._sslobj = _ssl.sslwrap(self._sock, server_side,
114 keyfile, certfile,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000115 cert_reqs, ssl_version, ca_certs,
116 ciphers)
Bill Janssen934b16d2008-06-28 22:19:33 +0000117 if do_handshake_on_connect:
118 timeout = self.gettimeout()
119 try:
120 self.settimeout(None)
121 self.do_handshake()
122 finally:
123 self.settimeout(timeout)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000124 self.keyfile = keyfile
125 self.certfile = certfile
126 self.cert_reqs = cert_reqs
127 self.ssl_version = ssl_version
128 self.ca_certs = ca_certs
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000129 self.ciphers = ciphers
Bill Janssen934b16d2008-06-28 22:19:33 +0000130 self.do_handshake_on_connect = do_handshake_on_connect
131 self.suppress_ragged_eofs = suppress_ragged_eofs
132 self._makefile_refs = 0
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000133
134 def read(self, len=1024):
Bill Janssen24bccf22007-08-30 17:07:28 +0000135
136 """Read up to LEN bytes and return them.
137 Return zero-length string on EOF."""
138
Bill Janssen934b16d2008-06-28 22:19:33 +0000139 try:
140 return self._sslobj.read(len)
141 except SSLError, x:
142 if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs:
143 return ''
144 else:
145 raise
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000146
147 def write(self, data):
Bill Janssen24bccf22007-08-30 17:07:28 +0000148
149 """Write DATA to the underlying SSL channel. Returns
150 number of bytes of DATA actually transmitted."""
151
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000152 return self._sslobj.write(data)
153
Bill Janssen98d19da2007-09-10 21:51:02 +0000154 def getpeercert(self, binary_form=False):
Bill Janssen24bccf22007-08-30 17:07:28 +0000155
156 """Returns a formatted version of the data in the
157 certificate provided by the other end of the SSL channel.
158 Return None if no certificate was provided, {} if a
159 certificate was provided, but not validated."""
160
Bill Janssen98d19da2007-09-10 21:51:02 +0000161 return self._sslobj.peer_certificate(binary_form)
162
Ezio Melottib01f5e62010-01-18 09:10:26 +0000163 def cipher(self):
Bill Janssen98d19da2007-09-10 21:51:02 +0000164
165 if not self._sslobj:
166 return None
167 else:
168 return self._sslobj.cipher()
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000169
Ezio Melottib01f5e62010-01-18 09:10:26 +0000170 def send(self, data, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000171 if self._sslobj:
172 if flags != 0:
173 raise ValueError(
174 "non-zero flags not allowed in calls to send() on %s" %
175 self.__class__)
Bill Janssen934b16d2008-06-28 22:19:33 +0000176 while True:
177 try:
178 v = self._sslobj.write(data)
179 except SSLError, x:
180 if x.args[0] == SSL_ERROR_WANT_READ:
181 return 0
182 elif x.args[0] == SSL_ERROR_WANT_WRITE:
183 return 0
184 else:
185 raise
186 else:
187 return v
Bill Janssen426ea0a2007-08-29 22:35:05 +0000188 else:
189 return socket.send(self, data, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000190
Ezio Melottib01f5e62010-01-18 09:10:26 +0000191 def sendto(self, data, addr, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000192 if self._sslobj:
Bill Janssen934b16d2008-06-28 22:19:33 +0000193 raise ValueError("sendto not allowed on instances of %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000194 self.__class__)
195 else:
Bill Janssen934b16d2008-06-28 22:19:33 +0000196 return socket.sendto(self, data, addr, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000197
Ezio Melottib01f5e62010-01-18 09:10:26 +0000198 def sendall(self, data, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000199 if self._sslobj:
200 if flags != 0:
201 raise ValueError(
202 "non-zero flags not allowed in calls to sendall() on %s" %
203 self.__class__)
Bill Janssen934b16d2008-06-28 22:19:33 +0000204 amount = len(data)
205 count = 0
206 while (count < amount):
207 v = self.send(data[count:])
208 count += v
209 return amount
Bill Janssen426ea0a2007-08-29 22:35:05 +0000210 else:
211 return socket.sendall(self, data, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000212
Ezio Melottib01f5e62010-01-18 09:10:26 +0000213 def recv(self, buflen=1024, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000214 if self._sslobj:
215 if flags != 0:
216 raise ValueError(
Antoine Pitrou448da712010-03-21 19:33:38 +0000217 "non-zero flags not allowed in calls to recv() on %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000218 self.__class__)
Antoine Pitrou448da712010-03-21 19:33:38 +0000219 return self.read(buflen)
Bill Janssen426ea0a2007-08-29 22:35:05 +0000220 else:
221 return socket.recv(self, buflen, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000222
Ezio Melottib01f5e62010-01-18 09:10:26 +0000223 def recv_into(self, buffer, nbytes=None, flags=0):
Bill Janssen61c001a2008-09-08 16:37:24 +0000224 if buffer and (nbytes is None):
225 nbytes = len(buffer)
226 elif nbytes is None:
227 nbytes = 1024
228 if self._sslobj:
229 if flags != 0:
230 raise ValueError(
231 "non-zero flags not allowed in calls to recv_into() on %s" %
232 self.__class__)
Antoine Pitrou448da712010-03-21 19:33:38 +0000233 tmp_buffer = self.read(nbytes)
234 v = len(tmp_buffer)
235 buffer[:v] = tmp_buffer
236 return v
Bill Janssen61c001a2008-09-08 16:37:24 +0000237 else:
238 return socket.recv_into(self, buffer, nbytes, flags)
239
Ezio Melottib01f5e62010-01-18 09:10:26 +0000240 def recvfrom(self, addr, buflen=1024, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000241 if self._sslobj:
Bill Janssen934b16d2008-06-28 22:19:33 +0000242 raise ValueError("recvfrom not allowed on instances of %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000243 self.__class__)
244 else:
Bill Janssen934b16d2008-06-28 22:19:33 +0000245 return socket.recvfrom(self, addr, buflen, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000246
Ezio Melottib01f5e62010-01-18 09:10:26 +0000247 def recvfrom_into(self, buffer, nbytes=None, flags=0):
Bill Janssen61c001a2008-09-08 16:37:24 +0000248 if self._sslobj:
249 raise ValueError("recvfrom_into not allowed on instances of %s" %
250 self.__class__)
251 else:
252 return socket.recvfrom_into(self, buffer, nbytes, flags)
253
Ezio Melottib01f5e62010-01-18 09:10:26 +0000254 def pending(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000255 if self._sslobj:
256 return self._sslobj.pending()
257 else:
258 return 0
259
Ezio Melottib01f5e62010-01-18 09:10:26 +0000260 def unwrap(self):
Bill Janssen39295c22008-08-12 16:31:21 +0000261 if self._sslobj:
262 s = self._sslobj.shutdown()
263 self._sslobj = None
264 return s
265 else:
266 raise ValueError("No SSL wrapper around " + str(self))
267
Ezio Melottib01f5e62010-01-18 09:10:26 +0000268 def shutdown(self, how):
Bill Janssen296a59d2007-09-16 22:06:00 +0000269 self._sslobj = None
Bill Janssen426ea0a2007-08-29 22:35:05 +0000270 socket.shutdown(self, how)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000271
Ezio Melottib01f5e62010-01-18 09:10:26 +0000272 def close(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000273 if self._makefile_refs < 1:
274 self._sslobj = None
275 socket.close(self)
276 else:
277 self._makefile_refs -= 1
278
Ezio Melottib01f5e62010-01-18 09:10:26 +0000279 def do_handshake(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000280
281 """Perform a TLS/SSL handshake."""
282
283 self._sslobj.do_handshake()
284
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000285 def connect(self, addr):
Bill Janssen24bccf22007-08-30 17:07:28 +0000286
287 """Connects to remote ADDR, and then wraps the connection in
288 an SSL channel."""
289
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000290 # Here we assume that the socket is client-side, and not
291 # connected at the time of the call. We connect it, then wrap it.
Bill Janssen426ea0a2007-08-29 22:35:05 +0000292 if self._sslobj:
Bill Janssen98d19da2007-09-10 21:51:02 +0000293 raise ValueError("attempt to connect already-connected SSLSocket!")
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000294 socket.connect(self, addr)
Bill Janssen426ea0a2007-08-29 22:35:05 +0000295 self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000296 self.cert_reqs, self.ssl_version,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000297 self.ca_certs, self.ciphers)
Bill Janssen934b16d2008-06-28 22:19:33 +0000298 if self.do_handshake_on_connect:
299 self.do_handshake()
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000300
301 def accept(self):
Bill Janssen24bccf22007-08-30 17:07:28 +0000302
303 """Accepts a new connection from a remote client, and returns
304 a tuple containing that new connection wrapped with a server-side
305 SSL channel, and the address of the remote client."""
306
Bill Janssen426ea0a2007-08-29 22:35:05 +0000307 newsock, addr = socket.accept(self)
Bill Janssen934b16d2008-06-28 22:19:33 +0000308 return (SSLSocket(newsock,
309 keyfile=self.keyfile,
310 certfile=self.certfile,
311 server_side=True,
312 cert_reqs=self.cert_reqs,
313 ssl_version=self.ssl_version,
314 ca_certs=self.ca_certs,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000315 ciphers=self.ciphers,
Bill Janssen934b16d2008-06-28 22:19:33 +0000316 do_handshake_on_connect=self.do_handshake_on_connect,
317 suppress_ragged_eofs=self.suppress_ragged_eofs),
318 addr)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000319
Bill Janssen296a59d2007-09-16 22:06:00 +0000320 def makefile(self, mode='r', bufsize=-1):
321
Bill Janssen61c001a2008-09-08 16:37:24 +0000322 """Make and return a file-like object that
323 works with the SSL connection. Just use the code
324 from the socket module."""
Bill Janssen296a59d2007-09-16 22:06:00 +0000325
Bill Janssen934b16d2008-06-28 22:19:33 +0000326 self._makefile_refs += 1
Antoine Pitroub558f172010-04-23 23:25:45 +0000327 # close=True so as to decrement the reference count when done with
328 # the file-like object.
329 return _fileobject(self, mode, bufsize, close=True)
Bill Janssen296a59d2007-09-16 22:06:00 +0000330
331
332
Bill Janssen98d19da2007-09-10 21:51:02 +0000333def wrap_socket(sock, keyfile=None, certfile=None,
334 server_side=False, cert_reqs=CERT_NONE,
Bill Janssen934b16d2008-06-28 22:19:33 +0000335 ssl_version=PROTOCOL_SSLv23, ca_certs=None,
336 do_handshake_on_connect=True,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000337 suppress_ragged_eofs=True, ciphers=None):
Bill Janssen98d19da2007-09-10 21:51:02 +0000338
339 return SSLSocket(sock, keyfile=keyfile, certfile=certfile,
340 server_side=server_side, cert_reqs=cert_reqs,
Bill Janssen934b16d2008-06-28 22:19:33 +0000341 ssl_version=ssl_version, ca_certs=ca_certs,
342 do_handshake_on_connect=do_handshake_on_connect,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000343 suppress_ragged_eofs=suppress_ragged_eofs,
344 ciphers=ciphers)
Bill Janssen934b16d2008-06-28 22:19:33 +0000345
Bill Janssen98d19da2007-09-10 21:51:02 +0000346
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000347# some utility functions
348
349def cert_time_to_seconds(cert_time):
Bill Janssen24bccf22007-08-30 17:07:28 +0000350
351 """Takes a date-time string in standard ASN1_print form
352 ("MON DAY 24HOUR:MINUTE:SEC YEAR TIMEZONE") and return
353 a Python time value in seconds past the epoch."""
354
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000355 import time
356 return time.mktime(time.strptime(cert_time, "%b %d %H:%M:%S %Y GMT"))
357
Bill Janssen296a59d2007-09-16 22:06:00 +0000358PEM_HEADER = "-----BEGIN CERTIFICATE-----"
359PEM_FOOTER = "-----END CERTIFICATE-----"
360
361def DER_cert_to_PEM_cert(der_cert_bytes):
362
363 """Takes a certificate in binary DER format and returns the
364 PEM version of it as a string."""
365
366 if hasattr(base64, 'standard_b64encode'):
367 # preferred because older API gets line-length wrong
368 f = base64.standard_b64encode(der_cert_bytes)
369 return (PEM_HEADER + '\n' +
370 textwrap.fill(f, 64) +
371 PEM_FOOTER + '\n')
372 else:
373 return (PEM_HEADER + '\n' +
374 base64.encodestring(der_cert_bytes) +
375 PEM_FOOTER + '\n')
376
377def PEM_cert_to_DER_cert(pem_cert_string):
378
379 """Takes a certificate in ASCII PEM format and returns the
380 DER-encoded version of it as a byte sequence"""
381
382 if not pem_cert_string.startswith(PEM_HEADER):
383 raise ValueError("Invalid PEM encoding; must start with %s"
384 % PEM_HEADER)
385 if not pem_cert_string.strip().endswith(PEM_FOOTER):
386 raise ValueError("Invalid PEM encoding; must end with %s"
387 % PEM_FOOTER)
388 d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
389 return base64.decodestring(d)
390
Ezio Melottib01f5e62010-01-18 09:10:26 +0000391def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
Bill Janssen296a59d2007-09-16 22:06:00 +0000392
393 """Retrieve the certificate from the server at the specified address,
394 and return it as a PEM-encoded string.
395 If 'ca_certs' is specified, validate the server cert against it.
396 If 'ssl_version' is specified, use it in the connection attempt."""
397
398 host, port = addr
399 if (ca_certs is not None):
400 cert_reqs = CERT_REQUIRED
401 else:
402 cert_reqs = CERT_NONE
403 s = wrap_socket(socket(), ssl_version=ssl_version,
404 cert_reqs=cert_reqs, ca_certs=ca_certs)
405 s.connect(addr)
406 dercert = s.getpeercert(True)
407 s.close()
408 return DER_cert_to_PEM_cert(dercert)
409
Ezio Melottib01f5e62010-01-18 09:10:26 +0000410def get_protocol_name(protocol_code):
Bill Janssen296a59d2007-09-16 22:06:00 +0000411 if protocol_code == PROTOCOL_TLSv1:
412 return "TLSv1"
413 elif protocol_code == PROTOCOL_SSLv23:
414 return "SSLv23"
415 elif protocol_code == PROTOCOL_SSLv2:
416 return "SSLv2"
417 elif protocol_code == PROTOCOL_SSLv3:
418 return "SSLv3"
419 else:
420 return "<unknown>"
421
422
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000423# a replacement for the old socket.ssl function
424
Ezio Melottib01f5e62010-01-18 09:10:26 +0000425def sslwrap_simple(sock, keyfile=None, certfile=None):
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000426
Bill Janssen24bccf22007-08-30 17:07:28 +0000427 """A replacement for the old socket.ssl function. Designed
428 for compability with Python 2.5 and earlier. Will disappear in
429 Python 3.0."""
430
Bill Jansseneb257ac2008-09-29 18:56:38 +0000431 if hasattr(sock, "_sock"):
432 sock = sock._sock
433
434 ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE,
Bill Janssen934b16d2008-06-28 22:19:33 +0000435 PROTOCOL_SSLv23, None)
Bill Jansseneb257ac2008-09-29 18:56:38 +0000436 try:
437 sock.getpeername()
Benjamin Peterson941db4d2008-12-31 04:08:55 +0000438 except socket_error:
Bill Jansseneb257ac2008-09-29 18:56:38 +0000439 # no, no connection yet
440 pass
441 else:
442 # yes, do the handshake
443 ssl_sock.do_handshake()
444
Bill Janssen934b16d2008-06-28 22:19:33 +0000445 return ssl_sock