[rpms/openssl] rebase_40beta: - Assign IANA numbers for hybrid PQ KEX

[Sahana Prasad <sahana@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/openssl
            Branch : rebase_40beta
            Commit : b14ac3b4573830453533930ff8cf719c0fac450c
            Author : Sahana Prasad <sahana@redhat.com>
            Date   : 2024-07-10T12:09:25+02:00
            Stats  : +35/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/openssl/c/b14ac3b4573830453533930ff8cf719c0fac450c?branch=rebase_40beta

            Log:
            - Assign IANA numbers for hybrid PQ KEX
- Porting the fix in https://github.com/openssl/openssl/pull/22803

Signed-off-by: Sahana Prasad <sahana@redhat.com>

---
diff --git a/0122-Assign-IANA-numbers-for-hybrid-PQ-KEX.patch b/0122-Assign-IANA-numbers-for-hybrid-PQ-KEX.patch
new file mode 100644
index 0000000..ff99aa7
--- /dev/null
+++ b/0122-Assign-IANA-numbers-for-hybrid-PQ-KEX.patch
@@ -0,0 +1,27 @@
+From 303b630a564aaf3dcb1e4e96d8fa396e7ad980e4 Mon Sep 17 00:00:00 2001
+From: Sahana Prasad <sahana@redhat.com>
+Date: Tue, 9 Jul 2024 12:29:04 +0200
+Subject: [PATCH 50/50] Assign IANA numbers for hybrid PQ KEX Porting the fix
+ in https://github.com/openssl/openssl/pull/22803
+
+Signed-off-by: Sahana Prasad <sahana@redhat.com>
+---
+ ssl/t1_trce.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
+index b05012f74f..29dce65e4f 100644
+--- a/ssl/t1_trce.c
++++ b/ssl/t1_trce.c
+@@ -545,6 +545,8 @@ static const ssl_trace_tbl ssl_groups_tbl[] = {
+     {258, "ffdhe4096"},
+     {259, "ffdhe6144"},
+     {260, "ffdhe8192"},
++    {25497, "X25519Kyber768Draft00"},
++    {25498, "SecP256r1Kyber768Draft00"},
+     {0xFF01, "arbitrary_explicit_prime_curves"},
+     {0xFF02, "arbitrary_explicit_char2_curves"}
+ };
+-- 
+2.41.0
+

diff --git a/openssl.spec b/openssl.spec
index 651d1b6..51a2a94 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16))
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 3.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
@@ -151,6 +151,9 @@ Patch117: 0117-ignore-unknown-sigalgorithms-groups.patch
 Patch120: 0120-Allow-disabling-of-SHA1-signatures.patch
 # From CentOS 9
 Patch121: 0121-FIPS-cms-defaults.patch
+# [PATCH 50/50] Assign IANA numbers for hybrid PQ KEX Porting the fix
+#  in https://github.com/openssl/openssl/pull/22803
+Patch122: 0122-Assign-IANA-numbers-for-hybrid-PQ-KEX.patch
 
 License: Apache-2.0
 URL: http://www.openssl.org/
@@ -521,6 +524,10 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Jul 09 2024 Sahana Prasad  <sahana@redhat.com> - 1:3.2.2-4
+- Assign IANA numbers for hybrid PQ KEX
+- Porting the fix in https://github.com/openssl/openssl/pull/22803
+
 * Mon Jul 01 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-3
 - Moving engine-related files to a separate subpackage to be deprecated in future
   Resolves: rhbz#2276420