Ensure we correctly handle links to 1.1.1 commits

Commits for version 1.1.1x or above are premium support only

Also fixes the logic for 1.0.2 (the first premium support release was 1.0.2v)

Reviewed-by: Anton Arapov <anton@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/web/pull/454)

diff --git a/bin/cvejsontohtml.py b/bin/cvejsontohtml.py
index 1c6fd996d62c1632c853c1fb556f031d319b7dcd..443bef42eef18cf0405935ff86f4ceaa2fd7a8dd 100644 (file)
--- a/bin/cvejsontohtml.py
+++ b/bin/cvejsontohtml.py
@@ -213,8 +213,9 @@ for k, cve in sorted(entries.items(), reverse=True):
                     commitId = git.split(";")[-1].split("=")[-1]
                     git = f"https://github.com/openssl/openssl/commit/{commitId}"
                 if (
-                    fixedin.startswith("1.0.2") and fixedin[5] >= "w"
-                ):  # 1.0.2w and above hack
+                    (fixedin.startswith("1.0.2") and fixedin[5] >= "v")
+                    or (fixedin.startswith("1.1.1") and fixedin[5] >= "x")
+                ):  # 1.0.2v/1.1.1x and above hack
                     allissues += (
                         '<a href="/support/contracts.html?giturl=%s">(premium support)</a> '
                         % (git)