Commit Graph

30 Commits

Author SHA1 Message Date
Antoine Pitrou
b52187710e Issue #4870: Add an options attribute to SSL contexts, as well as
several ``OP_*`` constants to the `ssl` module.  This allows to selectively
disable protocol versions, when used in combination with `PROTOCOL_SSLv23`.
2010-05-21 09:56:06 +00:00
Antoine Pitrou
152efa2ae2 Issue #8550: Add first class SSLContext objects to the ssl module. 2010-05-16 18:19:27 +00:00
Antoine Pitrou
90e6d04071 Remove unused import 2010-04-26 23:06:26 +00:00
Antoine Pitrou
fa2b9380c0 Hopefully fix sporadic Windows issue by avoiding calling getpeername()
on a freshly dup'ed socket.
2010-04-26 22:17:47 +00:00
Antoine Pitrou
de8cf32ec8 Merged revisions 80507 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80507 | antoine.pitrou | 2010-04-26 19:23:33 +0200 (lun., 26 avril 2010) | 4 lines

  When calling getpeername() in SSLSocket.__init__, only silence exceptions
  caused by the "socket not connected" condition.
........
2010-04-26 17:29:05 +00:00
Antoine Pitrou
40f0874b55 Issue #8524: When creating an SSL socket, the timeout value of the
original socket wasn't retained (instead, a socket with a positive timeout
would be turned into a non-blocking SSL socket).
2010-04-24 22:04:40 +00:00
Antoine Pitrou
2d9cb9c1cb Merged revisions 80151 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80151 | antoine.pitrou | 2010-04-17 19:10:38 +0200 (sam., 17 avril 2010) | 4 lines

  Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the
  available cipher list.  Helps fix test_ssl with OpenSSL 1.0.0.
........
2010-04-17 17:40:45 +00:00
Antoine Pitrou
04f6a32dff Merged revisions 79812 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79812 | antoine.pitrou | 2010-04-05 23:35:07 +0200 (lun., 05 avril 2010) | 5 lines

  Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
  using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
  and `ssl.OPENSSL_VERSION_NUMBER`.
........
2010-04-05 21:40:07 +00:00
Antoine Pitrou
37c1f18a72 Fix a blunder in r79287. This part is, obviously, poorly tested (if at all). 2010-03-22 15:07:09 +00:00
Antoine Pitrou
5733c08f55 Merged revisions 79226,79286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79226 | antoine.pitrou | 2010-03-21 20:33:38 +0100 (dim., 21 mars 2010) | 4 lines

  Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
........
  r79286 | antoine.pitrou | 2010-03-22 15:41:48 +0100 (lun., 22 mars 2010) | 3 lines

  Fix an occasional test_ftplib failure, following r79226.
........
2010-03-22 14:49:10 +00:00
Ezio Melotti
dc55e67505 Merged revisions 77595 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77595 | ezio.melotti | 2010-01-18 11:10:26 +0200 (Mon, 18 Jan 2010) | 1 line

  #7730: remove spaces after functions names
........
2010-01-18 09:15:14 +00:00
Georg Brandl
706824f19f More codestring -> codebytes. 2009-06-04 09:42:55 +00:00
Benjamin Peterson
c071d3a41c fix name usage 2008-12-31 04:10:35 +00:00
Benjamin Peterson
9c069fd76e #4788 qualify remove a bare except 2008-12-31 03:43:28 +00:00
Bill Janssen
58afe4c194 fixes from issue 3162 for SSL module 2008-09-08 16:45:19 +00:00
Bill Janssen
40a0f66e95 clean up ssl.py; expose unwrap and add test for it 2008-08-12 16:56:25 +00:00
Bill Janssen
980f3149a2 fix bad method names in ssl module (and typo in ssl doc) 2008-06-29 00:05:51 +00:00
Christian Heimes
05e8be17fd Merged revisions 60990-61002 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60990 | eric.smith | 2008-02-23 17:05:26 +0100 (Sat, 23 Feb 2008) | 1 line

  Removed duplicate Py_CHARMASK define.  It's already defined in Python.h.
........
  r60991 | andrew.kuchling | 2008-02-23 17:23:05 +0100 (Sat, 23 Feb 2008) | 4 lines

  #1330538: Improve comparison of xmlrpclib.DateTime and datetime instances.
  Remove automatic handling of datetime.date and datetime.time.
  This breaks backward compatibility, but python-dev discussion was strongly
  against this automatic conversion; see the bug for a link.
........
  r60994 | andrew.kuchling | 2008-02-23 17:39:43 +0100 (Sat, 23 Feb 2008) | 1 line

  #835521: Add index entries for various pickle-protocol methods and attributes
........
  r60995 | andrew.kuchling | 2008-02-23 18:10:46 +0100 (Sat, 23 Feb 2008) | 2 lines

  #1433694: minidom's .normalize() failed to set .nextSibling for last element.
  Fix by Malte Helmert
........
  r61000 | christian.heimes | 2008-02-23 18:40:11 +0100 (Sat, 23 Feb 2008) | 1 line

  Patch #2167 from calvin: Remove unused imports
........
  r61001 | christian.heimes | 2008-02-23 18:42:31 +0100 (Sat, 23 Feb 2008) | 1 line

  Patch #1957: syslogmodule: Release GIL when calling syslog(3)
........
  r61002 | christian.heimes | 2008-02-23 18:52:07 +0100 (Sat, 23 Feb 2008) | 2 lines

  Issue #2051 and patch from Alexander Belopolsky:
  Permission for pyc and pyo files are inherited from the py file.
........
2008-02-23 18:30:17 +00:00
Bill Janssen
54cc54c1fe update to fix leak in SSL code 2007-12-14 22:08:56 +00:00
Guido van Rossum
e6650f91ea Reverting revision 59394. We'll sort this out later. 2007-12-06 19:05:55 +00:00
Guido van Rossum
03b5c9ae75 Fix the leaks in test_ssl. Issue 1469. Patch by Christian Heimes:
(a) added GC support to the PySSL object
(b) move the call to _real_close() from __del__ methods in Python to
PySSL_dealloc().
(c) remove those __del__ methods -- this makes SSL and socket objects GC'able.
2007-12-06 18:39:46 +00:00
Bill Janssen
48dc27c040 most recent changes to SSL module to support non-blocking sockets properly 2007-12-05 03:38:10 +00:00
Guido van Rossum
b7b030ec37 Disable dup() of SSLSocket. I don't think it can be made to work. 2007-11-16 01:28:45 +00:00
Guido van Rossum
39eb8fa0db This is roughly socket2.diff from issue 1378, with a few changes applied
to ssl.py (no need to test whether we can dup any more).
Regular sockets no longer have a _base, but we still have explicit
reference counting of socket objects for the benefit of makefile();
using duplicate sockets won't work for SSLSocket.
2007-11-16 01:24:05 +00:00
Guido van Rossum
5b8b1555de Fix some minor style nits. (I'll leave adding __all__ and making the
docstrings conform to PEP 8 to someone else.)
2007-11-16 00:06:11 +00:00