Issue #21976: Fix test_ssl to accept LibreSSL version strings.
Thanks to William Orr.
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 37a0cdb..91b8029 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -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 --git a/Misc/ACKS b/Misc/ACKS
index 2dc0e77..7fcfae0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -981,6 +981,7 @@
Tomas Oppelstrup
Jason Orendorff
Douglas Orr
+William Orr
Michele Orrù
Oleg Oshmyan
Denis S. Otkidach
diff --git a/Misc/NEWS b/Misc/NEWS
index 0181a46..433b273 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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?
===========================