cpython: 33fc081285b2 (original) (raw)

--- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -175,11 +175,11 @@ class BasicSocketTests(unittest.TestCase # Some sanity checks follow # >= 0.9 self.assertGreaterEqual(n, 0x900000)

```
   # < 2.0[](#l1.7)
```

   self.assertLess(n, 0x20000000)[](#l1.8)

```
   # < 3.0[](#l1.9)
```

   self.assertLess(n, 0x30000000)[](#l1.10)
   major, minor, fix, patch, status = t[](#l1.11)
   self.assertGreaterEqual(major, 0)[](#l1.12)

```
   self.assertLess(major, 2)[](#l1.13)
```

   self.assertLess(major, 3)[](#l1.14)
   self.assertGreaterEqual(minor, 0)[](#l1.15)
   self.assertLess(minor, 256)[](#l1.16)
   self.assertGreaterEqual(fix, 0)[](#l1.17)

@@ -188,9 +188,13 @@ class BasicSocketTests(unittest.TestCase self.assertLessEqual(patch, 26) self.assertGreaterEqual(status, 0) self.assertLessEqual(status, 15)

   # Version string as returned by OpenSSL, the format might change[](#l1.22)

   self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),[](#l1.23)

```
                   (s, t))[](#l1.24)
```

   # Version string as returned by {Open,Libre}SSL, the format might change[](#l1.25)

```
   if "LibreSSL" in s:[](#l1.26)
```

       self.assertTrue(s.startswith("LibreSSL {:d}.{:d}".format(major, minor)),[](#l1.27)

                       (s, t))[](#l1.28)

```
   else:[](#l1.29)
```

       self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),[](#l1.30)

                       (s, t))[](#l1.31)

@test_support.requires_resource('network') def test_ciphers(self):

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -981,6 +981,7 @@ Piet van Oostrum Tomas Oppelstrup Jason Orendorff Douglas Orr +William Orr Michele Orrù Oleg Oshmyan Denis S. Otkidach

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,12 @@ Library

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? ===========================