Commit graph

568 commits

Author SHA1 Message Date
Antoine Pitrou
467f28de03 Followup on r81233: fix test_ssl with OpenSSL < 1.0.0. 2010-05-16 19:22:44 +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
d75b2a90d9 Merged revisions 80869 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80869 | antoine.pitrou | 2010-05-06 16:11:23 +0200 (jeu., 06 mai 2010) | 3 lines

  `self` doesn't exist here
........
2010-05-06 14:15:10 +00:00
Antoine Pitrou
1bbb68d37c self doesn't exist here 2010-05-06 14:11:23 +00:00
Antoine Pitrou
452a580848 Issue #8629: Disable some test_ssl tests, since they give different
results with OpenSSL 1.0.0 and higher.
2010-05-06 13:54:43 +00:00
Antoine Pitrou
7effde0014 Merged revisions 80692 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80692 | antoine.pitrou | 2010-05-01 22:29:38 +0200 (sam., 01 mai 2010) | 9 lines

  Merged revisions 80690 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines

    Remove duplicate test
  ........
................
2010-05-01 20:33:30 +00:00
Antoine Pitrou
70d8a86ea0 Merged revisions 80690 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines

  Remove duplicate test
........
2010-05-01 20:29:38 +00:00
Antoine Pitrou
8651810df9 Remove duplicate test 2010-05-01 20:26:58 +00:00
Antoine Pitrou
b199796f97 Merged revisions 80603 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80603 | antoine.pitrou | 2010-04-29 00:57:15 +0200 (jeu., 29 avril 2010) | 3 lines

  Fix test failure with -bb
........
2010-04-28 22:58:16 +00:00
Antoine Pitrou
764b8780db Fix test failure with -bb 2010-04-28 22:57:15 +00:00
Antoine Pitrou
91382d8a23 Merged revisions 80598 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80598 | antoine.pitrou | 2010-04-28 23:37:09 +0200 (mer., 28 avril 2010) | 9 lines

  Merged revisions 80596 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80596 | antoine.pitrou | 2010-04-28 23:11:01 +0200 (mer., 28 avril 2010) | 3 lines

    Fix style issues in test_ssl
  ........
................
2010-04-28 21:39:56 +00:00
Antoine Pitrou
480a124973 Merged revisions 80596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80596 | antoine.pitrou | 2010-04-28 23:11:01 +0200 (mer., 28 avril 2010) | 3 lines

  Fix style issues in test_ssl
........
2010-04-28 21:37:09 +00:00
Antoine Pitrou
3945c867d6 Fix style issues in test_ssl 2010-04-28 21:11:01 +00:00
Antoine Pitrou
00f905e8f2 Merged revisions 80559 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80559 | antoine.pitrou | 2010-04-28 00:08:08 +0200 (mer., 28 avril 2010) | 12 lines

  Merged revisions 80557 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  (the bug was already fixed in py3k, just merging in the tests)

  ........
    r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines

    Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
    before the certificate footer.  Patch by Kyle VanderBeek.
  ........
................
2010-04-27 22:09:05 +00:00
Antoine Pitrou
9bfbe61961 Merged revisions 80557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

(the bug was already fixed in py3k, just merging in the tests)

........
  r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
  before the certificate footer.  Patch by Kyle VanderBeek.
........
2010-04-27 22:08:08 +00:00
Antoine Pitrou
4c7bcf1194 Issue #8086: In :func:ssl.DER_cert_to_PEM_cert(), fix missing newline
before the certificate footer.  Patch by Kyle VanderBeek.
2010-04-27 22:03:37 +00:00
Antoine Pitrou
537bed68ba Merged revisions 80536 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80536 | antoine.pitrou | 2010-04-27 15:15:18 +0200 (mar., 27 avril 2010) | 9 lines

  Merged revisions 80534 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines

    socket.error can really happen here, and fix a possible NameError
  ........
................
2010-04-27 13:16:06 +00:00
Antoine Pitrou
05830aa4ff Merged revisions 80534 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines

  socket.error can really happen here, and fix a possible NameError
........
2010-04-27 13:15:18 +00:00
Antoine Pitrou
9bf5425f5f socket.error can really happen here, and fix a possible NameError 2010-04-27 13:13:26 +00:00
Antoine Pitrou
66ffb26239 Merged revisions 80532 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80532 | antoine.pitrou | 2010-04-27 12:59:39 +0200 (mar., 27 avril 2010) | 10 lines

  Merged revisions 80529 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80529 | antoine.pitrou | 2010-04-27 12:32:58 +0200 (mar., 27 avril 2010) | 4 lines

    Qualify or remove or bare excepts.  Simplify exception handling in places.
    Remove uses of test_support.TestFailed.
  ........
................
2010-04-27 11:05:15 +00:00
Antoine Pitrou
18c913e2b1 Merged revisions 80529 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80529 | antoine.pitrou | 2010-04-27 12:32:58 +0200 (mar., 27 avril 2010) | 4 lines

  Qualify or remove or bare excepts.  Simplify exception handling in places.
  Remove uses of test_support.TestFailed.
........
2010-04-27 10:59:39 +00:00
Antoine Pitrou
be168130d1 Merged revisions 80528 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80528 | antoine.pitrou | 2010-04-27 11:56:02 +0200 (mar., 27 avril 2010) | 11 lines

  Merged revisions 80526 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80526 | antoine.pitrou | 2010-04-27 11:51:18 +0200 (mar., 27 avril 2010) | 5 lines

    replace custom code with standard library functionality (HTTPServer.shutdown())
    + enable test that was never run (!)
    + make tests faster by lowering polling timeout
  ........
................
2010-04-27 10:41:37 +00:00
Antoine Pitrou
db187847fb Qualify or remove or bare excepts. Simplify exception handling in places.
Remove uses of test_support.TestFailed.
2010-04-27 10:32:58 +00:00
Antoine Pitrou
af7c6026c7 Merged revisions 80526 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80526 | antoine.pitrou | 2010-04-27 11:51:18 +0200 (mar., 27 avril 2010) | 5 lines

  replace custom code with standard library functionality (HTTPServer.shutdown())
  + enable test that was never run (!)
  + make tests faster by lowering polling timeout
........
2010-04-27 09:56:02 +00:00
Antoine Pitrou
435ba0cfb8 replace custom code with standard library functionality (HTTPServer.shutdown())
+ enable test that was never run (!)
+ make tests faster by lowering polling timeout
2010-04-27 09:51:18 +00:00
Antoine Pitrou
0fb2e54c87 Merged revisions 80524 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80524 | antoine.pitrou | 2010-04-27 10:53:36 +0200 (mar., 27 avril 2010) | 9 lines

  Merged revisions 80522 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80522 | antoine.pitrou | 2010-04-27 10:40:51 +0200 (mar., 27 avril 2010) | 3 lines

    Remove uses of find_unused_port() in test_ssl, and small cleanups
  ........
................
2010-04-27 08:58:38 +00:00
Antoine Pitrou
773b5db01a Merged revisions 80522 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80522 | antoine.pitrou | 2010-04-27 10:40:51 +0200 (mar., 27 avril 2010) | 3 lines

  Remove uses of find_unused_port() in test_ssl, and small cleanups
........
2010-04-27 08:53:36 +00:00
Antoine Pitrou
150acda57f Remove uses of find_unused_port() in test_ssl, and small cleanups 2010-04-27 08:40:51 +00:00
Antoine Pitrou
c2203f92ff Merged revisions 80456 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80456 | antoine.pitrou | 2010-04-25 00:04:40 +0200 (dim., 25 avril 2010) | 5 lines

  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:07:51 +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
ec146185c4 Merged revisions 80454 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80454 | antoine.pitrou | 2010-04-24 23:26:44 +0200 (sam., 24 avril 2010) | 15 lines

  Merged revisions 80451-80452 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80451 | antoine.pitrou | 2010-04-24 21:57:01 +0200 (sam., 24 avril 2010) | 4 lines

    The do_handshake() method of SSL objects now adjusts the blocking mode of
    the SSL structure if necessary (as other methods already do).
  ........
    r80452 | antoine.pitrou | 2010-04-24 22:04:58 +0200 (sam., 24 avril 2010) | 4 lines

    Issue #5103: SSL handshake would ignore the socket timeout and block
    indefinitely if the other end didn't respond.
  ........
................
2010-04-24 21:30:20 +00:00
Antoine Pitrou
d3f8ab8bd3 Merged revisions 80451-80452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80451 | antoine.pitrou | 2010-04-24 21:57:01 +0200 (sam., 24 avril 2010) | 4 lines

  The do_handshake() method of SSL objects now adjusts the blocking mode of
  the SSL structure if necessary (as other methods already do).
........
  r80452 | antoine.pitrou | 2010-04-24 22:04:58 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #5103: SSL handshake would ignore the socket timeout and block
  indefinitely if the other end didn't respond.
........
2010-04-24 21:26:44 +00:00
Antoine Pitrou
fc69af1562 Issue #5103: SSL handshake would ignore the socket timeout and block
indefinitely if the other end didn't respond.
2010-04-24 20:04:58 +00:00
Antoine Pitrou
fe0f117ce6 Merged revisions 80436 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80436 | antoine.pitrou | 2010-04-24 13:13:53 +0200 (sam., 24 avril 2010) | 11 lines

  Merged revisions 80434 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80434 | antoine.pitrou | 2010-04-24 12:43:57 +0200 (sam., 24 avril 2010) | 5 lines

    Make test_makefile_close a networked test (can't read() from a non-connected
    socket under OS X), and skip it under Windows (where sockets can't be read()
    from using their fds).
  ........
................
2010-04-24 11:17:37 +00:00
Antoine Pitrou
e322024449 Merged revisions 80434 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80434 | antoine.pitrou | 2010-04-24 12:43:57 +0200 (sam., 24 avril 2010) | 5 lines

  Make test_makefile_close a networked test (can't read() from a non-connected
  socket under OS X), and skip it under Windows (where sockets can't be read()
  from using their fds).
........
2010-04-24 11:13:53 +00:00
Antoine Pitrou
55841ac1a5 Make test_makefile_close a networked test (can't read() from a non-connected
socket under OS X), and skip it under Windows (where sockets can't be read()
from using their fds).
2010-04-24 10:43:57 +00:00
Antoine Pitrou
3b9b9bab3d Merged revisions 80429 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80429 | antoine.pitrou | 2010-04-24 01:31:47 +0200 (sam., 24 avril 2010) | 13 lines

  Note: I'm just merging in the additional test.


  Merged revisions 80428 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines

    Issue #5238: Calling makefile() on an SSL object would prevent the
    underlying socket from being closed until all objects get truely destroyed.
  ........
................
2010-04-23 23:33:50 +00:00
Antoine Pitrou
cfcd8adf71 Note: I'm just merging in the additional test.
Merged revisions 80428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #5238: Calling makefile() on an SSL object would prevent the
  underlying socket from being closed until all objects get truely destroyed.
........
2010-04-23 23:31:47 +00:00
Antoine Pitrou
b558f17b18 Issue #5238: Calling makefile() on an SSL object would prevent the
underlying socket from being closed until all objects get truely destroyed.
2010-04-23 23:25:45 +00:00
Antoine Pitrou
78f4a9a1f5 Merged revisions 80426 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80426 | antoine.pitrou | 2010-04-24 01:10:32 +0200 (sam., 24 avril 2010) | 13 lines

  Only the test is merged in.


  Merged revisions 80423 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80423 | antoine.pitrou | 2010-04-24 00:54:59 +0200 (sam., 24 avril 2010) | 4 lines

    Issue #7943: Fix circular reference created when instantiating an SSL
    socket.  Initial patch by Péter Szabó.
  ........
................
2010-04-23 23:12:22 +00:00
Antoine Pitrou
9d5436621f Only the test is merged in.
Merged revisions 80423 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80423 | antoine.pitrou | 2010-04-24 00:54:59 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #7943: Fix circular reference created when instantiating an SSL
  socket.  Initial patch by Péter Szabó.
........
2010-04-23 23:10:32 +00:00
Antoine Pitrou
dfb299bb95 Issue #7943: Fix circular reference created when instantiating an SSL
socket.  Initial patch by Péter Szabó.
2010-04-23 22:54:59 +00:00
Antoine Pitrou
754b98c9b4 Little fix in test comment 2010-04-22 18:47:06 +00:00
Antoine Pitrou
ae92a72b21 Merged revisions 80379 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80379 | antoine.pitrou | 2010-04-22 20:43:31 +0200 (jeu., 22 avril 2010) | 9 lines

  Merged revisions 80375 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80375 | antoine.pitrou | 2010-04-22 20:00:41 +0200 (jeu., 22 avril 2010) | 3 lines

    Skip test on old versions of OpenSSL
  ........
................
2010-04-22 18:46:16 +00:00
Antoine Pitrou
29619b2aff Merged revisions 80375 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80375 | antoine.pitrou | 2010-04-22 20:00:41 +0200 (jeu., 22 avril 2010) | 3 lines

  Skip test on old versions of OpenSSL
........
2010-04-22 18:43:31 +00:00
Antoine Pitrou
9aed604fb2 Skip test on old versions of OpenSSL 2010-04-22 18:00:41 +00:00
Antoine Pitrou
60b1ee375c Temporarily display OpenSSL version in verbose run -- trying to diagnose failure on Neal's buildbot. 2010-04-22 17:44:41 +00:00
Antoine Pitrou
da6902cb7b Merged revisions 80317 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80317 | antoine.pitrou | 2010-04-21 21:46:23 +0200 (mer., 21 avril 2010) | 15 lines

  Merged revisions 80314-80315 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80314 | antoine.pitrou | 2010-04-21 21:28:03 +0200 (mer., 21 avril 2010) | 5 lines

    Issue #8484: Load all ciphers and digest algorithms when initializing
    the _ssl extension, such that verification of some SSL certificates
    doesn't fail because of an "unknown algorithm".
  ........
    r80315 | antoine.pitrou | 2010-04-21 21:36:23 +0200 (mer., 21 avril 2010) | 3 lines

    Forgot to add the sample certificate (followup to r80314)
  ........
................
2010-04-21 19:52:52 +00:00
Antoine Pitrou
fec12fff0f Merged revisions 80314-80315 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80314 | antoine.pitrou | 2010-04-21 21:28:03 +0200 (mer., 21 avril 2010) | 5 lines

  Issue #8484: Load all ciphers and digest algorithms when initializing
  the _ssl extension, such that verification of some SSL certificates
  doesn't fail because of an "unknown algorithm".
........
  r80315 | antoine.pitrou | 2010-04-21 21:36:23 +0200 (mer., 21 avril 2010) | 3 lines

  Forgot to add the sample certificate (followup to r80314)
........
2010-04-21 19:46:23 +00:00
Antoine Pitrou
c715a9ed08 Issue #8484: Load all ciphers and digest algorithms when initializing
the _ssl extension, such that verification of some SSL certificates
doesn't fail because of an "unknown algorithm".
2010-04-21 19:28:03 +00:00