8000 [3.8] bpo-38820: Old OpenSSL 3.0.0 releases are in /old/3.0/ (GH-25624) by miss-islington · Pull Request #25627 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.8] bpo-38820: Old OpenSSL 8000 3.0.0 releases are in /old/3.0/ (GH-25624) #25627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2021
Merged

[3.8] bpo-38820: Old OpenSSL 3.0.0 releases are in /old/3.0/ (GH-25624) #25627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-38820: Old OpenSSL 3.0.0 releases are in /old/3.0/ (GH-25624) 
Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 3c586ca)

Co-authored-by: Christian Heimes <christian@python.org>
  • Loading branch information
@tiran
tiran committed Apr 26, 2021
commit 15eb5c5eb0147225a7d1b3fadedee1017c7b0c9b
24 changes: 14 additions & 10 deletions Tools/ssl/multissltests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from urllib.error import HTTPError
except ImportError:
from urllib2 import urlopen, HTTPError
import re
import shutil
import string
import subprocess
Expand Down Expand Up @@ -434,23 +435,26 @@ 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:
f.write(OPENSSL_FIPS_CNF.format(self=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"
Expand Down
0