changeset:   91754:33fc081285b2
branch:      2.7
parent:      91739:847a0e74c4cc
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Mon Jul 21 18:35:01 2014 -0400
files:       Lib/test/test_ssl.py Misc/ACKS Misc/NEWS
description:
Issue #21976: Fix test_ssl to accept LibreSSL version strings.
Thanks to William Orr.


diff -r 847a0e74c4cc -r 33fc081285b2 Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Sun Jul 20 21:26:04 2014 -0700
+++ b/Lib/test/test_ssl.py	Mon Jul 21 18:35:01 2014 -0400
@@ -175,11 +175,11 @@
         # Some sanity checks follow
         # >= 0.9
         self.assertGreaterEqual(n, 0x900000)
-        # < 2.0
-        self.assertLess(n, 0x20000000)
+        # < 3.0
+        self.assertLess(n, 0x30000000)
         major, minor, fix, patch, status = t
         self.assertGreaterEqual(major, 0)
-        self.assertLess(major, 2)
+        self.assertLess(major, 3)
         self.assertGreaterEqual(minor, 0)
         self.assertLess(minor, 256)
         self.assertGreaterEqual(fix, 0)
@@ -188,9 +188,13 @@
         self.assertLessEqual(patch, 26)
         self.assertGreaterEqual(status, 0)
         self.assertLessEqual(status, 15)
-        # Version string as returned by OpenSSL, the format might change
-        self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),
-                        (s, t))
+        # Version string as returned by {Open,Libre}SSL, the format might change
+        if "LibreSSL" in s:
+            self.assertTrue(s.startswith("LibreSSL {:d}.{:d}".format(major, minor)),
+                            (s, t))
+        else:
+            self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),
+                            (s, t))
 
     @test_support.requires_resource('network')
     def test_ciphers(self):
diff -r 847a0e74c4cc -r 33fc081285b2 Misc/ACKS
--- a/Misc/ACKS	Sun Jul 20 21:26:04 2014 -0700
+++ b/Misc/ACKS	Mon Jul 21 18:35:01 2014 -0400
@@ -981,6 +981,7 @@
 Tomas Oppelstrup
 Jason Orendorff
 Douglas Orr
+William Orr
 Michele Orrù
 Oleg Oshmyan
 Denis S. Otkidach
diff -r 847a0e74c4cc -r 33fc081285b2 Misc/NEWS
--- a/Misc/NEWS	Sun Jul 20 21:26:04 2014 -0700
+++ b/Misc/NEWS	Mon Jul 21 18:35:01 2014 -0400
@@ -37,6 +37,12 @@
 - Issue #21323: Fix CGIHTTPServer to again handle scripts in CGI subdirectories,
   broken by the fix for security issue #19435.  Patch by Zach Byrne.
 
+Tests
+-----
+
+- Issue #21976: Fix test_ssl to accept LibreSSL version strings.  Thanks
+  to William Orr.
+
 
 What's New in Python 2.7.8?
 ===========================