From e8271a2ceeacee9d40e47a26443222d2dd6ca222 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@mangadex.org>
Date: Wed, 2 Nov 2022 15:44:20 +0000
Subject: [PATCH 1/2] Revert "Merge branch 'openssl-crit-vuln-tmp111' into
 'main'"

This reverts commit cd2a7ce9f19377ee152e54a6b6aca0644ab60384, reversing
changes made to 393170a3d327ece09589d3b2d67910c489b45dbb.
---
 deps/quictls/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/deps/quictls/Makefile b/deps/quictls/Makefile
index 0b4e137..50a7993 100644
--- a/deps/quictls/Makefile
+++ b/deps/quictls/Makefile
@@ -1,9 +1,8 @@
-OPENSSL_VERSION = 1.1.1q
+OPENSSL_VERSION = 3.0.6
 BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
 QUICTLS_BUILD_VERSION = quic-mangadex-$(BUILD_VERSION_REPOSHA)
-QUICTLS_TAG = OpenSSL_$(subst .,_,$(OPENSSL_VERSION))+quic1
 
-QUICTLS_SOURCES = https://codeload.github.com/quictls/openssl/tar.gz/$(QUICTLS_TAG)
+QUICTLS_SOURCES = https://codeload.github.com/quictls/openssl/tar.gz/openssl-$(OPENSSL_VERSION)+quic
 QUICTLS_TARBALL = quictls-$(OPENSSL_VERSION).tar.gz
 QUICTLS_BUILDIR = src
 QUICTLS_DESTDIR = dist
@@ -20,9 +19,11 @@ $(QUICTLS_BUILDIR): $(QUICTLS_TARBALL)
 	tar -C $(QUICTLS_BUILDIR) --strip-components=1 -xf "$(QUICTLS_TARBALL)"
 
 build: $(QUICTLS_BUILDIR)
-	cd "$(QUICTLS_BUILDIR)" &&  sed -i 's/^# define OPENSSL_VERSION_TEXT.*$\/# define OPENSSL_VERSION_TEXT "OpenSSL $(OPENSSL_VERSION)+$(QUICTLS_BUILD_VERSION) $(shell date -u +'%e %b %Y')"/g' "include/openssl/opensslv.h"
-	cd "$(QUICTLS_BUILDIR)" && CC=cc ./config --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" no-shared
-	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA)
+	cd "$(QUICTLS_BUILDIR)" && ! [ -f "VERSION.dat.orig" ] && mv -fv "VERSION.dat" "VERSION.dat.orig" || true
+	cd "$(QUICTLS_BUILDIR)" && sed 's/^BUILD_METADATA.*/BUILD_METADATA=$(QUICTLS_BUILD_VERSION)/g' "VERSION.dat.orig" > "VERSION.dat.meta"
+	cd "$(QUICTLS_BUILDIR)" && sed 's/^RELEASE_DATE.*/RELEASE_DATE="$(shell date -u +'%e %b %Y')"/g' "VERSION.dat.meta" > "VERSION.dat"
+	cd "$(QUICTLS_BUILDIR)" && CC=cc ./Configure --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" -DPURIFY no-shared
+	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA) build_sw
 	"$(QUICTLS_BUILDIR)/apps/openssl" version
 	$(MAKE) buildinfo_$(shell uname -s)
 

From 7b33131e590a0f386b3068f5f2d2b2c494b400dd Mon Sep 17 00:00:00 2001
From: Tristan <tristan@mangadex.org>
Date: Wed, 2 Nov 2022 15:45:05 +0000
Subject: [PATCH 2/2] Upgrade QuicTLS to OpenSSL 3.0.7 base

---
 deps/quictls/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/quictls/Makefile b/deps/quictls/Makefile
index 50a7993..6fc1b6c 100644
--- a/deps/quictls/Makefile
+++ b/deps/quictls/Makefile
@@ -1,4 +1,4 @@
-OPENSSL_VERSION = 3.0.6
+OPENSSL_VERSION = 3.0.7
 BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
 QUICTLS_BUILD_VERSION = quic-mangadex-$(BUILD_VERSION_REPOSHA)