blob: 1d29bef72d62062d7ab14397eab1ed9c23bfdcf5 [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:
Antoine Pitroufc69af12010-04-24 20:04:58 +0000118 self.do_handshake()
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000119 self.keyfile = keyfile
120 self.certfile = certfile
121 self.cert_reqs = cert_reqs
122 self.ssl_version = ssl_version
123 self.ca_certs = ca_certs
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000124 self.ciphers = ciphers
Bill Janssen934b16d2008-06-28 22:19:33 +0000125 self.do_handshake_on_connect = do_handshake_on_connect
126 self.suppress_ragged_eofs = suppress_ragged_eofs
127 self._makefile_refs = 0
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000128
129 def read(self, len=1024):
Bill Janssen24bccf22007-08-30 17:07:28 +0000130
131 """Read up to LEN bytes and return them.
132 Return zero-length string on EOF."""
133
Bill Janssen934b16d2008-06-28 22:19:33 +0000134 try:
135 return self._sslobj.read(len)
136 except SSLError, x:
137 if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs:
138 return ''
139 else:
140 raise
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000141
142 def write(self, data):
Bill Janssen24bccf22007-08-30 17:07:28 +0000143
144 """Write DATA to the underlying SSL channel. Returns
145 number of bytes of DATA actually transmitted."""
146
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000147 return self._sslobj.write(data)
148
Bill Janssen98d19da2007-09-10 21:51:02 +0000149 def getpeercert(self, binary_form=False):
Bill Janssen24bccf22007-08-30 17:07:28 +0000150
151 """Returns a formatted version of the data in the
152 certificate provided by the other end of the SSL channel.
153 Return None if no certificate was provided, {} if a
154 certificate was provided, but not validated."""
155
Bill Janssen98d19da2007-09-10 21:51:02 +0000156 return self._sslobj.peer_certificate(binary_form)
157
Ezio Melottib01f5e62010-01-18 09:10:26 +0000158 def cipher(self):
Bill Janssen98d19da2007-09-10 21:51:02 +0000159
160 if not self._sslobj:
161 return None
162 else:
163 return self._sslobj.cipher()
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000164
Ezio Melottib01f5e62010-01-18 09:10:26 +0000165 def send(self, data, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000166 if self._sslobj:
167 if flags != 0:
168 raise ValueError(
169 "non-zero flags not allowed in calls to send() on %s" %
170 self.__class__)
Bill Janssen934b16d2008-06-28 22:19:33 +0000171 while True:
172 try:
173 v = self._sslobj.write(data)
174 except SSLError, x:
175 if x.args[0] == SSL_ERROR_WANT_READ:
176 return 0
177 elif x.args[0] == SSL_ERROR_WANT_WRITE:
178 return 0
179 else:
180 raise
181 else:
182 return v
Bill Janssen426ea0a2007-08-29 22:35:05 +0000183 else:
184 return socket.send(self, data, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000185
Ezio Melottib01f5e62010-01-18 09:10:26 +0000186 def sendto(self, data, addr, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000187 if self._sslobj:
Bill Janssen934b16d2008-06-28 22:19:33 +0000188 raise ValueError("sendto not allowed on instances of %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000189 self.__class__)
190 else:
Bill Janssen934b16d2008-06-28 22:19:33 +0000191 return socket.sendto(self, data, addr, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000192
Ezio Melottib01f5e62010-01-18 09:10:26 +0000193 def sendall(self, data, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000194 if self._sslobj:
195 if flags != 0:
196 raise ValueError(
197 "non-zero flags not allowed in calls to sendall() on %s" %
198 self.__class__)
Bill Janssen934b16d2008-06-28 22:19:33 +0000199 amount = len(data)
200 count = 0
201 while (count < amount):
202 v = self.send(data[count:])
203 count += v
204 return amount
Bill Janssen426ea0a2007-08-29 22:35:05 +0000205 else:
206 return socket.sendall(self, data, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000207
Ezio Melottib01f5e62010-01-18 09:10:26 +0000208 def recv(self, buflen=1024, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000209 if self._sslobj:
210 if flags != 0:
211 raise ValueError(
Antoine Pitrou448da712010-03-21 19:33:38 +0000212 "non-zero flags not allowed in calls to recv() on %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000213 self.__class__)
Antoine Pitrou448da712010-03-21 19:33:38 +0000214 return self.read(buflen)
Bill Janssen426ea0a2007-08-29 22:35:05 +0000215 else:
216 return socket.recv(self, buflen, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000217
Ezio Melottib01f5e62010-01-18 09:10:26 +0000218 def recv_into(self, buffer, nbytes=None, flags=0):
Bill Janssen61c001a2008-09-08 16:37:24 +0000219 if buffer and (nbytes is None):
220 nbytes = len(buffer)
221 elif nbytes is None:
222 nbytes = 1024
223 if self._sslobj:
224 if flags != 0:
225 raise ValueError(
226 "non-zero flags not allowed in calls to recv_into() on %s" %
227 self.__class__)
Antoine Pitrou448da712010-03-21 19:33:38 +0000228 tmp_buffer = self.read(nbytes)
229 v = len(tmp_buffer)
230 buffer[:v] = tmp_buffer
231 return v
Bill Janssen61c001a2008-09-08 16:37:24 +0000232 else:
233 return socket.recv_into(self, buffer, nbytes, flags)
234
Ezio Melottib01f5e62010-01-18 09:10:26 +0000235 def recvfrom(self, addr, buflen=1024, flags=0):
Bill Janssen426ea0a2007-08-29 22:35:05 +0000236 if self._sslobj:
Bill Janssen934b16d2008-06-28 22:19:33 +0000237 raise ValueError("recvfrom not allowed on instances of %s" %
Bill Janssen426ea0a2007-08-29 22:35:05 +0000238 self.__class__)
239 else:
Bill Janssen934b16d2008-06-28 22:19:33 +0000240 return socket.recvfrom(self, addr, buflen, flags)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000241
Ezio Melottib01f5e62010-01-18 09:10:26 +0000242 def recvfrom_into(self, buffer, nbytes=None, flags=0):
Bill Janssen61c001a2008-09-08 16:37:24 +0000243 if self._sslobj:
244 raise ValueError("recvfrom_into not allowed on instances of %s" %
245 self.__class__)
246 else:
247 return socket.recvfrom_into(self, buffer, nbytes, flags)
248
Ezio Melottib01f5e62010-01-18 09:10:26 +0000249 def pending(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000250 if self._sslobj:
251 return self._sslobj.pending()
252 else:
253 return 0
254
Ezio Melottib01f5e62010-01-18 09:10:26 +0000255 def unwrap(self):
Bill Janssen39295c22008-08-12 16:31:21 +0000256 if self._sslobj:
257 s = self._sslobj.shutdown()
258 self._sslobj = None
259 return s
260 else:
261 raise ValueError("No SSL wrapper around " + str(self))
262
Ezio Melottib01f5e62010-01-18 09:10:26 +0000263 def shutdown(self, how):
Bill Janssen296a59d2007-09-16 22:06:00 +0000264 self._sslobj = None
Bill Janssen426ea0a2007-08-29 22:35:05 +0000265 socket.shutdown(self, how)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000266
Ezio Melottib01f5e62010-01-18 09:10:26 +0000267 def close(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000268 if self._makefile_refs < 1:
269 self._sslobj = None
270 socket.close(self)
271 else:
272 self._makefile_refs -= 1
273
Ezio Melottib01f5e62010-01-18 09:10:26 +0000274 def do_handshake(self):
Bill Janssen934b16d2008-06-28 22:19:33 +0000275
276 """Perform a TLS/SSL handshake."""
277
278 self._sslobj.do_handshake()
279
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000280 def connect(self, addr):
Bill Janssen24bccf22007-08-30 17:07:28 +0000281
282 """Connects to remote ADDR, and then wraps the connection in
283 an SSL channel."""
284
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000285 # Here we assume that the socket is client-side, and not
286 # connected at the time of the call. We connect it, then wrap it.
Bill Janssen426ea0a2007-08-29 22:35:05 +0000287 if self._sslobj:
Bill Janssen98d19da2007-09-10 21:51:02 +0000288 raise ValueError("attempt to connect already-connected SSLSocket!")
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000289 socket.connect(self, addr)
Bill Janssen426ea0a2007-08-29 22:35:05 +0000290 self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000291 self.cert_reqs, self.ssl_version,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000292 self.ca_certs, self.ciphers)
Bill Janssen934b16d2008-06-28 22:19:33 +0000293 if self.do_handshake_on_connect:
294 self.do_handshake()
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000295
296 def accept(self):
Bill Janssen24bccf22007-08-30 17:07:28 +0000297
298 """Accepts a new connection from a remote client, and returns
299 a tuple containing that new connection wrapped with a server-side
300 SSL channel, and the address of the remote client."""
301
Bill Janssen426ea0a2007-08-29 22:35:05 +0000302 newsock, addr = socket.accept(self)
Bill Janssen934b16d2008-06-28 22:19:33 +0000303 return (SSLSocket(newsock,
304 keyfile=self.keyfile,
305 certfile=self.certfile,
306 server_side=True,
307 cert_reqs=self.cert_reqs,
308 ssl_version=self.ssl_version,
309 ca_certs=self.ca_certs,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000310 ciphers=self.ciphers,
Bill Janssen934b16d2008-06-28 22:19:33 +0000311 do_handshake_on_connect=self.do_handshake_on_connect,
312 suppress_ragged_eofs=self.suppress_ragged_eofs),
313 addr)
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000314
Bill Janssen296a59d2007-09-16 22:06:00 +0000315 def makefile(self, mode='r', bufsize=-1):
316
Bill Janssen61c001a2008-09-08 16:37:24 +0000317 """Make and return a file-like object that
318 works with the SSL connection. Just use the code
319 from the socket module."""
Bill Janssen296a59d2007-09-16 22:06:00 +0000320
Bill Janssen934b16d2008-06-28 22:19:33 +0000321 self._makefile_refs += 1
Antoine Pitroub558f172010-04-23 23:25:45 +0000322 # close=True so as to decrement the reference count when done with
323 # the file-like object.
324 return _fileobject(self, mode, bufsize, close=True)
Bill Janssen296a59d2007-09-16 22:06:00 +0000325
326
327
Bill Janssen98d19da2007-09-10 21:51:02 +0000328def wrap_socket(sock, keyfile=None, certfile=None,
329 server_side=False, cert_reqs=CERT_NONE,
Bill Janssen934b16d2008-06-28 22:19:33 +0000330 ssl_version=PROTOCOL_SSLv23, ca_certs=None,
331 do_handshake_on_connect=True,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000332 suppress_ragged_eofs=True, ciphers=None):
Bill Janssen98d19da2007-09-10 21:51:02 +0000333
334 return SSLSocket(sock, keyfile=keyfile, certfile=certfile,
335 server_side=server_side, cert_reqs=cert_reqs,
Bill Janssen934b16d2008-06-28 22:19:33 +0000336 ssl_version=ssl_version, ca_certs=ca_certs,
337 do_handshake_on_connect=do_handshake_on_connect,
Antoine Pitrou0a6373c2010-04-17 17:10:38 +0000338 suppress_ragged_eofs=suppress_ragged_eofs,
339 ciphers=ciphers)
Bill Janssen934b16d2008-06-28 22:19:33 +0000340
Bill Janssen98d19da2007-09-10 21:51:02 +0000341
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000342# some utility functions
343
344def cert_time_to_seconds(cert_time):
Bill Janssen24bccf22007-08-30 17:07:28 +0000345
346 """Takes a date-time string in standard ASN1_print form
347 ("MON DAY 24HOUR:MINUTE:SEC YEAR TIMEZONE") and return
348 a Python time value in seconds past the epoch."""
349
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000350 import time
351 return time.mktime(time.strptime(cert_time, "%b %d %H:%M:%S %Y GMT"))
352
Bill Janssen296a59d2007-09-16 22:06:00 +0000353PEM_HEADER = "-----BEGIN CERTIFICATE-----"
354PEM_FOOTER = "-----END CERTIFICATE-----"
355
356def DER_cert_to_PEM_cert(der_cert_bytes):
357
358 """Takes a certificate in binary DER format and returns the
359 PEM version of it as a string."""
360
361 if hasattr(base64, 'standard_b64encode'):
362 # preferred because older API gets line-length wrong
363 f = base64.standard_b64encode(der_cert_bytes)
364 return (PEM_HEADER + '\n' +
365 textwrap.fill(f, 64) +
366 PEM_FOOTER + '\n')
367 else:
368 return (PEM_HEADER + '\n' +
369 base64.encodestring(der_cert_bytes) +
370 PEM_FOOTER + '\n')
371
372def PEM_cert_to_DER_cert(pem_cert_string):
373
374 """Takes a certificate in ASCII PEM format and returns the
375 DER-encoded version of it as a byte sequence"""
376
377 if not pem_cert_string.startswith(PEM_HEADER):
378 raise ValueError("Invalid PEM encoding; must start with %s"
379 % PEM_HEADER)
380 if not pem_cert_string.strip().endswith(PEM_FOOTER):
381 raise ValueError("Invalid PEM encoding; must end with %s"
382 % PEM_FOOTER)
383 d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
384 return base64.decodestring(d)
385
Ezio Melottib01f5e62010-01-18 09:10:26 +0000386def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
Bill Janssen296a59d2007-09-16 22:06:00 +0000387
388 """Retrieve the certificate from the server at the specified address,
389 and return it as a PEM-encoded string.
390 If 'ca_certs' is specified, validate the server cert against it.
391 If 'ssl_version' is specified, use it in the connection attempt."""
392
393 host, port = addr
394 if (ca_certs is not None):
395 cert_reqs = CERT_REQUIRED
396 else:
397 cert_reqs = CERT_NONE
398 s = wrap_socket(socket(), ssl_version=ssl_version,
399 cert_reqs=cert_reqs, ca_certs=ca_certs)
400 s.connect(addr)
401 dercert = s.getpeercert(True)
402 s.close()
403 return DER_cert_to_PEM_cert(dercert)
404
Ezio Melottib01f5e62010-01-18 09:10:26 +0000405def get_protocol_name(protocol_code):
Bill Janssen296a59d2007-09-16 22:06:00 +0000406 if protocol_code == PROTOCOL_TLSv1:
407 return "TLSv1"
408 elif protocol_code == PROTOCOL_SSLv23:
409 return "SSLv23"
410 elif protocol_code == PROTOCOL_SSLv2:
411 return "SSLv2"
412 elif protocol_code == PROTOCOL_SSLv3:
413 return "SSLv3"
414 else:
415 return "<unknown>"
416
417
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000418# a replacement for the old socket.ssl function
419
Ezio Melottib01f5e62010-01-18 09:10:26 +0000420def sslwrap_simple(sock, keyfile=None, certfile=None):
Guido van Rossum4f2c3dd2007-08-25 15:08:43 +0000421
Bill Janssen24bccf22007-08-30 17:07:28 +0000422 """A replacement for the old socket.ssl function. Designed
423 for compability with Python 2.5 and earlier. Will disappear in
424 Python 3.0."""
425
Bill Jansseneb257ac2008-09-29 18:56:38 +0000426 if hasattr(sock, "_sock"):
427 sock = sock._sock
428
429 ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE,
Bill Janssen934b16d2008-06-28 22:19:33 +0000430 PROTOCOL_SSLv23, None)
Bill Jansseneb257ac2008-09-29 18:56:38 +0000431 try:
432 sock.getpeername()
Benjamin Peterson941db4d2008-12-31 04:08:55 +0000433 except socket_error:
Bill Jansseneb257ac2008-09-29 18:56:38 +0000434 # no, no connection yet
435 pass
436 else:
437 # yes, do the handshake
438 ssl_sock.do_handshake()
439
Bill Janssen934b16d2008-06-28 22:19:33 +0000440 return ssl_sock