[Python-checkins] [3.8] bpo-38820: Old OpenSSL 3.0.0 releases are in /old/3.0/ (GH-25624) (GH-25627)
miss-islington
webhook-mailer at python.org
Mon Apr 26 05:35:40 EDT 2021
https://github.com/python/cpython/commit/10ee2662dfeeb3b00d232f8f1c2eecc4d7e65244
commit: 10ee2662dfeeb3b00d232f8f1c2eecc4d7e65244
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-04-26T02:35:32-07:00
summary:
[3.8] bpo-38820: Old OpenSSL 3.0.0 releases are in /old/3.0/ (GH-25624) (GH-25627)
Signed-off-by: Christian Heimes <christian at python.org>
(cherry picked from commit 3c586ca500854476e6eff06713236faff233d035)
Co-authored-by: Christian Heimes <christian at python.org>
Automerge-Triggered-By: GH:tiran
files:
M Tools/ssl/multissltests.py
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 64afd6733f4e8..1904f3bf25bee 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -33,6 +33,7 @@
from urllib.error import HTTPError
except ImportError:
from urllib2 import urlopen, HTTPError
+import re
import shutil
import string
import subprocess
@@ -434,11 +435,11 @@ def _post_install_300(self):
self.openssl_cli, "fipsinstall",
"-out", fipsinstall_cnf,
"-module", fips_mod,
- "-provider_name", "fips",
- "-mac_name", "HMAC",
- "-macopt", "digest:SHA256",
- "-macopt", "hexkey:00",
- "-section_name", "fips_sect"
+ # "-provider_name", "fips",
+ # "-mac_name", "HMAC",
+ # "-macopt", "digest:SHA256",
+ # "-macopt", "hexkey:00",
+ # "-section_name", "fips_sect"
]
)
with open(openssl_fips_cnf, "w") as f:
@@ -446,11 +447,14 @@ def _post_install_300(self):
@property
def short_version(self):
"""Short version for OpenSSL download URL"""
- short_version = self.version.rstrip(string.ascii_letters)
- if short_version.startswith("0.9"):
- short_version = "0.9.x"
- return short_version
-
+ mo = re.search(r"^(\d+)\.(\d+)\.(\d+)", self.version)
+ parsed = tuple(int(m) for m in mo.groups())
+ if parsed < (1, 0, 0):
+ return "0.9.x"
+ if parsed >= (3, 0, 0):
+ # OpenSSL 3.0.0 -> /old/3.0/
+ parsed = parsed[:2]
+ return ".".join(str(i) for i in parsed)
class BuildLibreSSL(AbstractBuilder):
library = "LibreSSL"
More information about the Python-checkins
mailing list