From 18420b31a5b4426d1d30b9dadded92856489a338 Mon Sep 17 00:00:00 2001
From: Clemens Lang <cllang@redhat.com>
Date: Jul 07 2022 11:57:01 +0000
Subject: Upgrade to 1.1.1q


(cherry picked from commit f1f57e7a77668d1eacb237e3da577d81e89d49fd in
rpms/openssl1.1)

Resolves: CVE-2022-2097
Signed-off-by: Clemens Lang <cllang@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 7d60123..99dc3d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ openssl-1.0.0a-usa.tar.bz2
 /openssl-1.1.1n-hobbled.tar.xz
 /openssl-1.1.1o-hobbled.tar.xz
 /openssl-1.1.1p-hobbled.tar.xz
+/openssl-1.1.1q-hobbled.tar.xz
diff --git a/openssl-1.1.1-version-override.patch b/openssl-1.1.1-version-override.patch
index f4b422a..20b32c6 100644
--- a/openssl-1.1.1-version-override.patch
+++ b/openssl-1.1.1-version-override.patch
@@ -1,12 +1,12 @@
-diff -up openssl-1.1.1p/include/openssl/opensslv.h.version-override openssl-1.1.1p/include/openssl/opensslv.h
---- openssl-1.1.1p/include/openssl/opensslv.h.version-override	2022-06-30 17:05:54.254846593 +0200
-+++ openssl-1.1.1p/include/openssl/opensslv.h	2022-06-30 17:06:47.013810795 +0200
+diff -up openssl-1.1.1q/include/openssl/opensslv.h.version-override openssl-1.1.1q/include/openssl/opensslv.h
+--- openssl-1.1.1q/include/openssl/opensslv.h.version-override	2022-07-07 13:14:40.123541142 +0200
++++ openssl-1.1.1q/include/openssl/opensslv.h	2022-07-07 13:15:20.777288763 +0200
 @@ -40,7 +40,7 @@ extern "C" {
   *  major minor fix final patch/beta)
   */
- # define OPENSSL_VERSION_NUMBER  0x1010110fL
--# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1p  21 Jun 2022"
-+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1p  FIPS 21 Jun 2022"
+ # define OPENSSL_VERSION_NUMBER  0x1010111fL
+-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1q  5 Jul 2022"
++# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1q  FIPS 5 Jul 2022"
  
  /*-
   * The macros below are to be used for shared library (.so, .dll, ...)
diff --git a/openssl.spec b/openssl.spec
index 565e623..ab6363b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -21,7 +21,7 @@
 
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
-Version: 1.1.1p
+Version: 1.1.1q
 Release: 1%{?dist}
 Epoch: 1
 # We have to remove certain patented algorithms from the openssl source
@@ -479,6 +479,10 @@ export LD_LIBRARY_PATH
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 07 2022 Clemens Lang <cllang@redhat.com> - 1:1.1.1q-1
+- Upgrade to 1.1.1q
+  Resolves: CVE-2022-2097
+
 * Thu Jun 30 2022 Clemens Lang <cllang@redhat.com> - 1:1.1.1p-1
 - Upgrade to 1.1.1p
   Resolves: CVE-2022-2068
diff --git a/sources b/sources
index 65f1cc2..e66cffc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openssl-1.1.1p-hobbled.tar.xz) = 4e59f9b696d88f9d1142395f3483752d1955cbbc7e9cc7fcef84088c8537bd7b61d4e7589024192cc1adf815cfefc5b052a8af3f5cd39fc164c78df993b183ad
+SHA512 (openssl-1.1.1q-hobbled.tar.xz) = 990ece28fdf0a03768983a990d89302bd03758c08b4d2b25cff652c37ecc4e1c2bda9e6e0afca527ab87fb8ee594639e14ab96b5c890ef2ea6c5fadcd894b624