[Python-checkins] r81234 - in python/branches/py3k/Lib/test: capath/4e1295a3.0 capath/5ed36f99.0 test_ssl.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun May 16 21:22:44 2010
New Revision: 81234

Log:
Followup on r81233: fix test_ssl with OpenSSL < 1.0.0.



Added:
   python/branches/py3k/Lib/test/capath/4e1295a3.0
      - copied unchanged from r81233, /python/branches/py3k/Lib/test/capath/6e88d7b8.0
   python/branches/py3k/Lib/test/capath/5ed36f99.0
      - copied unchanged from r81233, /python/branches/py3k/Lib/test/capath/99d0fa06.0
Modified:
   python/branches/py3k/Lib/test/test_ssl.py

Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Sun May 16 21:22:44 2010
@@ -300,6 +300,10 @@
 
     def test_connect_capath(self):
         # Verify server certificates using the `capath` argument
+        # NOTE: the subject hashing algorithm has been changed between
+        # OpenSSL 0.9.8n and 1.0.0, as a result the capath directory must
+        # contain both versions of each certificate (same content, different
+        # filename) for this test to be portable accross OpenSSL releases.
         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
         ctx.verify_mode = ssl.CERT_REQUIRED
         ctx.load_verify_locations(capath=CAPATH)