From cb8342a91ed05ff499b2d09b9aa87b488616f602 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Tue, 15 Nov 2022 12:39:18 +0000
Subject: [PATCH] Use AlmaLinux name in module signature and
 CONFIG_CRYPTO_FIPS_NAME

---
 SOURCES/x509.genkey.centos |  6 +++---
 SPECS/kernel.spec          | 14 +-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/SOURCES/x509.genkey.centos b/SOURCES/x509.genkey.centos
index c91af3b..4c34491 100644
--- a/SOURCES/x509.genkey.centos
+++ b/SOURCES/x509.genkey.centos
@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = The CentOS Project
-CN = CentOS Stream kernel signing key
-emailAddress = security@centos.org
+O = AlmaLinux
+CN = AlmaLinux kernel signing key
+emailAddress = security@almalinux.org
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 6e17490..5cf87d1 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -1520,7 +1520,7 @@ done
 # Adjust FIPS module name for RHEL
 %if 0%{?rhel}
 for i in *.config; do
-  sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i
+  sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="AlmaLinux %{rhel} - Kernel Cryptographic API"/' $i
 done
 %endif
 
@@ -1539,18 +1539,6 @@ done
 cp %{SOURCE82} .
 RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
 
-# We may want to override files from the primary target in case of building
-# against a flavour of it (eg. centos not rhel), thus override it here if
-# necessary
-if [ "%{primary_target}" == "rhel" ]; then
-%if 0%{?centos}
-  echo "Updating scripts/sources to centos version"
-  RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos
-%else
-  echo "Not updating scripts/sources to centos version"
-%endif
-fi
-
 # end of kernel config
 %endif