From 966e7501523f84ed75226f2ad140b742f16bf0e3 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: May 28 2019 08:08:45 +0000 Subject: First c8 kernel debranding patches Signed-off-by: Fabian Arrotin --- diff --git a/SOURCES/centos-ca-secureboot.der b/SOURCES/centos-ca-secureboot.der new file mode 100644 index 0000000..44a2563 Binary files /dev/null and b/SOURCES/centos-ca-secureboot.der differ diff --git a/SOURCES/centos.pem b/SOURCES/centos.pem new file mode 100644 index 0000000..beeb8f9 --- /dev/null +++ b/SOURCES/centos.pem @@ -0,0 +1,50 @@ +-----BEGIN CERTIFICATE----- +MIIEIzCCAougAwIBAgIEE3UDWTANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDDBZD +ZW50T1MgTGludXggS2VybmVsIENBMB4XDTE0MDYzMDExMTYwM1oXDTI5MDYyNjEx +MTYwM1owKjEoMCYGA1UEAwwfQ2VudE9TIExpbnV4IGtwYXRjaCBzaWduaW5nIGtl +eTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANXCPpbJH+WPXSVP+k+9 +598O1lfddTjG2tdPYYwGUSplrF6CGCNe+P2XA3yV9f8cOff37hhcMid4LiINlYxo +V8vMrCHCGEbgU5dQQv487RHbhgj4NHDT2fWh8l1SmmxEM7fWNLWOlg8t91yInxzT +jATwPvvWLqUona70ZLfYbtTcX2rpLtEu45UZQXa30q9gw4aeMHgdBGhhLDiZDaEk +XleuZG68FZOv0V09TsReEO4bIGDZtQX8wYgdjoP3qkxaNJ7Ievo3Q14M01yo/4Ex +BQeBYdqXAFs2Go89xTphNodEkgv0s/WtIxzhY51+oLLs/bbv241+Xc/7qDVgh3wy +JhOQyj3QRtF89sZclLwKQzHigsUTQ9nTPsFoEyomD0z4hlLicweAdVfF4/sYAM6t +jyu0wFNK1jGsCrwL/FEJlnUtJ0FAECFQyEgh1OyDIWZtoNr99z6I7zcFZsUAzEZL +TEHI93hW5WgXjNEmpd3EryLm8zGZKxv/FFxpYvH/kiNmiQIDAQABo1owWDAJBgNV +HRMEAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQU6gQTFSzeHZjr3KP+bwIwkEye +9xcwHwYDVR0jBBgwFoAUqUZJwlOKpfRREa3H5GE0gJhTjJEwDQYJKoZIhvcNAQEF +BQADggGBAHWsJgy+H8/xyIiBKqsVXjMOmDgGzB0vvOCN6FBGGhzadpUXzbbSc5e9 +BAeiYrRKGJd91kcU0hnnogAA6MkoTgzWd40Mx5Vpp6QxjzhkNAOCQ1ivdyg7wV4H +RX8qLZ6KbnUU7AawLmlsaWGuFcktgvCr5t+eMZsfCjbJY6EAA83ys8q7CWr3vXd5 +LPeA7Oa3m1EFbmBPsaA+ZoQRQu2yYukCHUB3MT4jdZI4Gh409WjumCFzG/PeWHAE +0J5D7SXcRwBBP+RxsPKfNIXC0ZlzCBsb84Wpe4t0g02zM+/VA0+/7olBbeXMJk15 +jYGj1LxFzZoBgiVm1lChcbaNDK+t5MLLYEUkxuQvYiSYYACLckCVqyoYFOLKWN87 +YiK7JrDTftMeOp2RcRcKIjkZaNrAUToxxkrFhInCneJSUjBJX5rDMwRPFJcRU+x1 +FENH+IwwwKOumtVOBpxCAyVhmEO25qYXCfRubcLd1J1baZY3ZZdBc0UaWdLs9GnO +gOt8OEJVGA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEKjCCApKgAwIBAgIEE3UDWDANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDDBZD +ZW50T1MgTGludXggS2VybmVsIENBMB4XDTE0MDYzMDExMTQ0OVoXDTI5MDYyNjEx +MTQ0OVowMTEvMC0GA1UEAwwmQ2VudE9TIExpbnV4IERyaXZlciB1cGRhdGUgc2ln +bmluZyBrZXkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDJ4yUCIt39 +AVy+5ifnogJCYx9omZOp98igGsqX4NrSoxk5qgEcwOgoRE7pu91rrVkmdqgyjJYf +eZtsgl/SxFpt1kiGIm1BGLhbwwzS+DQB4/twyBeR8rqZiIomp476K9KJOIij4ZVS +Qpddcc9jDehWhpxOdyzqIHnFSyd4rw7uwbfg73VmWAQ4L8HlhL4uKLuGHXiY8uL2 +LwMksXLt2vZqdCPjWAOJmFDD6KOAhqgS2X/yzb+twM5Cn00cBhuPGBY4d8OGmq6+ +8ksDKYXKu1OaIrbxA2ceRHJ59dPYdAykAFHTuLaQEhP5HNuGC17EXeZp0USronDd +Vp/96hz/soGvC5QS5/Z04nqzxBFOmhbJW1WcE6DJe+x54gQWwKcu6MHYrcfjt3yc +SgBijHwUvfa7Uc0jiv0AtHikc+vbM6QGI4FB44jCLAD8XeWBLia0GSIm04nV8BVR +1Q0sVabxN/NP8wXLj9TGdGBoo0q4tcLgMRRybCFp65fxCg87hFQ7eL0CAwEAAaNa +MFgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFH9CHuCraUYVdLs1 +iGHb53dipCAbMB8GA1UdIwQYMBaAFKlGScJTiqX0URGtx+RhNICYU4yRMA0GCSqG +SIb3DQEBBQUAA4IBgQBLZ6UPh1xyl1+OZGrfc1ZmNLGjPkok8cMVQOpBchQY+1Pq +SGjGwdTzUUJJpm/golOS+5bY5zexwaiMvvLbddfDk3K7EU6W4gdQq3qHFC9qI4c3 +GfJjZiPTLM5LXHNNM0ka2dnSB6971ACl95gyoA9rfNWqFHrzeChIZ2htO7z4qaRg +tTDHYkHmvl1Qx7uRyVAR6DikY6g+fsh6uXbQn1k2ddUYsoIeO7tF+CohDxmDTiyL +Z+r3E1k/yN+iU6L5WYxvTwPWxD0AlzDGOD4WxQ/CYrAlbi4Nc9AuoyOCRdDDBuui +ucDDTcpAdqOlsyleM6PMg4Xe/ygpg2D/xExcY/IFZtlg7NT03CU8GA800D0riLiL +dH4n6YYsbOr2EMePhYWcIBiiO66aViopk7SX9xvk9Am3zeADT7b0arK7tgSXQD6d +jLIDDfn3HZk3hViGE54PkkZxLcoYSS8qtYFF8n/2yAXWz+k6BYRoPdXzJK/cTIz+ +6OgKAnZKTsMApZmGeW8= +-----END CERTIFICATE----- diff --git a/SOURCES/centossecureboot001.crt b/SOURCES/centossecureboot001.crt new file mode 100644 index 0000000..321c4ec --- /dev/null +++ b/SOURCES/centossecureboot001.crt @@ -0,0 +1,81 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + b6:16:15:71:72:fb:31:7e + Signature Algorithm: sha256WithRSAEncryption + Issuer: CN=CentOS Secure Boot (CA key 1)/emailAddress=security@centos.org + Validity + Not Before: Aug 1 11:47:30 2018 GMT + Not After : Dec 31 11:47:30 2037 GMT + Subject: CN=CentOS Secure Boot (key 1)/emailAddress=security@centos.org + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (2048 bit) + Modulus (2048 bit): + 00:c1:a3:6a:f4:2d:71:83:6c:21:ca:0c:b7:ac:fa: + 76:80:43:03:40:87:5d:de:e9:1e:df:ad:e7:2b:51: + cb:f8:31:0f:9a:db:ab:23:25:04:11:05:57:7d:f2: + 4b:8d:1e:b3:75:78:1d:b9:57:8b:18:0b:bb:7e:e3: + 24:0f:6a:40:5f:2b:4f:03:a5:85:94:d2:f9:08:a0: + bc:db:a5:ea:4f:7f:e8:7c:d1:a9:f8:f0:9c:25:18: + 00:14:c4:c4:35:7d:1d:4c:8a:8d:95:f8:ed:65:97: + a5:a4:da:7d:cb:f0:33:3b:b7:03:94:68:47:05:57: + 6c:96:91:ac:14:f2:e3:f6:6d:4a:18:cf:68:8a:35: + 6f:8e:26:99:7f:db:c9:83:54:c2:c3:bf:ad:45:a0: + aa:a0:86:5f:20:b1:86:1b:ae:b7:28:15:11:f9:65: + 53:5d:70:33:9b:a3:c7:b5:c8:11:ff:55:3b:e7:46: + f1:6c:6b:8c:bb:f2:9f:36:23:b1:2d:23:2f:8f:4f: + 6c:a8:cc:ae:f5:56:9e:22:6c:0e:9a:4a:b1:bd:b2: + 76:15:5c:05:85:b8:5e:dc:8c:a5:c3:e0:75:51:a4: + 94:9b:03:2e:7b:f8:d3:b9:dd:7f:88:ce:2e:2f:28: + 4c:b4:92:2f:e6:e0:67:0a:d0:ff:c5:d2:79:a6:ef: + 94:0f + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:FALSE + X509v3 Key Usage: + Digital Signature + X509v3 Subject Key Identifier: + F0:37:C6:EA:EC:36:D4:05:7A:52:6C:0E:C6:D5:A9:5B:32:4E:E1:29 + X509v3 Authority Key Identifier: + keyid:54:EC:81:85:89:3E:E9:1A:DB:08:F7:44:88:54:7E:8E:3F:74:3A:F3 + + Signature Algorithm: sha256WithRSAEncryption + 97:97:ba:a6:0b:5b:bb:84:39:2e:ef:8b:51:9a:89:bb:65:3c: + dc:15:d0:5a:88:c5:af:ce:93:f5:c1:74:98:15:59:a9:38:da: + 11:fd:46:d5:4f:23:7c:03:1f:ae:0c:70:93:94:a7:61:2f:4b: + 2f:5f:bb:cc:8a:d7:4a:24:66:73:85:b4:19:13:fc:6a:61:4a: + 28:1f:a2:38:f4:72:90:03:c4:3e:64:63:8b:fb:15:22:22:4e: + b9:43:d9:b4:3d:3a:60:c1:4d:3a:09:85:68:7a:bc:3b:f9:ef: + f3:f5:e9:c9:4f:80:8c:c6:e9:cb:ef:28:44:b0:5d:d4:9e:4f: + 0f:02:9a:65:aa:98:35:b4:6f:d2:80:e3:08:ef:12:d0:17:56: + a6:a1:42:1e:1d:ab:e5:33:c0:fd:88:0d:40:42:81:c8:27:30: + 17:07:57:3e:05:9d:aa:05:0e:5b:3a:79:b4:29:aa:7c:42:5a: + ad:43:59:fb:34:4d:dc:62:58:63:e4:fb:de:bb:fd:6c:4e:97: + 58:f4:b9:99:4a:71:fe:7f:16:50:55:25:46:39:96:9b:88:6c: + 75:19:33:9e:70:b3:04:82:fe:16:a8:8e:22:47:83:6d:16:77: + da:26:ad:31:d8:06:6d:c5:7e:46:4b:21:ab:ae:ec:2a:93:71: + da:7f:89:1d +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgIJALYWFXFy+zF+MA0GCSqGSIb3DQEBCwUAMEwxJjAkBgNV +BAMMHUNlbnRPUyBTZWN1cmUgQm9vdCAoQ0Ega2V5IDEpMSIwIAYJKoZIhvcNAQkB +FhNzZWN1cml0eUBjZW50b3Mub3JnMB4XDTE4MDgwMTExNDczMFoXDTM3MTIzMTEx +NDczMFowSTEjMCEGA1UEAxMaQ2VudE9TIFNlY3VyZSBCb290IChrZXkgMSkxIjAg +BgkqhkiG9w0BCQEWE3NlY3VyaXR5QGNlbnRvcy5vcmcwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDBo2r0LXGDbCHKDLes+naAQwNAh13e6R7frecrUcv4 +MQ+a26sjJQQRBVd98kuNHrN1eB25V4sYC7t+4yQPakBfK08DpYWU0vkIoLzbpepP +f+h80an48JwlGAAUxMQ1fR1Mio2V+O1ll6Wk2n3L8DM7twOUaEcFV2yWkawU8uP2 +bUoYz2iKNW+OJpl/28mDVMLDv61FoKqghl8gsYYbrrcoFRH5ZVNdcDObo8e1yBH/ +VTvnRvFsa4y78p82I7EtIy+PT2yozK71Vp4ibA6aSrG9snYVXAWFuF7cjKXD4HVR +pJSbAy57+NO53X+Izi4vKEy0ki/m4GcK0P/F0nmm75QPAgMBAAGjXTBbMAwGA1Ud +EwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBTwN8bq7DbUBXpSbA7G1alb +Mk7hKTAfBgNVHSMEGDAWgBRU7IGFiT7pGtsI90SIVH6OP3Q68zANBgkqhkiG9w0B +AQsFAAOCAQEAl5e6pgtbu4Q5Lu+LUZqJu2U83BXQWojFr86T9cF0mBVZqTjaEf1G +1U8jfAMfrgxwk5SnYS9LL1+7zIrXSiRmc4W0GRP8amFKKB+iOPRykAPEPmRji/sV +IiJOuUPZtD06YMFNOgmFaHq8O/nv8/XpyU+AjMbpy+8oRLBd1J5PDwKaZaqYNbRv +0oDjCO8S0BdWpqFCHh2r5TPA/YgNQEKByCcwFwdXPgWdqgUOWzp5tCmqfEJarUNZ ++zRN3GJYY+T73rv9bE6XWPS5mUpx/n8WUFUlRjmWm4hsdRkznnCzBIL+FqiOIkeD +bRZ32iatMdgGbcV+Rkshq67sKpNx2n+JHQ== +-----END CERTIFICATE----- diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch new file mode 100644 index 0000000..5592a59 --- /dev/null +++ b/SOURCES/debrand-rh-i686-cpu.patch @@ -0,0 +1,11 @@ +--- a/arch/x86/boot/main.c 2019-03-13 04:04:53.000000000 -0700 ++++ b/arch/x86/boot/main.c 2019-05-25 14:31:21.043272496 -0700 +@@ -147,7 +147,7 @@ void main(void) + + /* Make sure we have all the proper CPU support */ + if (validate_cpu()) { +- puts("This processor is not supported in this version of RHEL.\n"); ++ puts("This processor is not supported in this version of CentOS Linux.\n"); + die(); + } + diff --git a/SOURCES/debrand-rh_taint.patch b/SOURCES/debrand-rh_taint.patch new file mode 100644 index 0000000..c2ae3c4 --- /dev/null +++ b/SOURCES/debrand-rh_taint.patch @@ -0,0 +1,81 @@ +--- a/kernel/rh_taint.c 2019-05-25 14:06:27.474558423 -0700 ++++ b/kernel/rh_taint.c 2019-05-25 14:25:53.471345832 -0700 +@@ -2,12 +2,12 @@ + #include + + /* +- * The following functions are used by Red Hat to indicate to users that +- * hardware and drivers are unsupported, or have limited support in RHEL major ++ * The following functions are used by CentOS to indicate to users that ++ * hardware and drivers are unsupported, or have limited support in CentOS Linux major + * and minor releases. These functions output loud warning messages to the end + * user and should be USED WITH CAUTION. + * +- * Any use of these functions _MUST_ be documented in the RHEL Release Notes, ++ * Any use of these functions _MUST_ be documented in the CentOS Linux Release Notes, + * and have approval of management. + */ + +@@ -16,15 +16,15 @@ + * @msg: Hardware name, class, or type + * + * Called to mark a device, class of devices, or types of devices as not having +- * support in any RHEL minor release. This does not TAINT the kernel. Red Hat +- * will not fix bugs against this hardware in this minor release. Red Hat may ++ * support in any CentOS Linux minor release. This does not TAINT the kernel. CentOS ++ * will not fix bugs against this hardware in this minor release. CentOS may + * declare support in a future major or minor update release. This cannot be + * used to mark drivers unsupported. + */ + void mark_hardware_unsupported(const char *msg) + { + /* Print one single message */ +- pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg); ++ pr_crit("Warning: %s - this hardware has not undergone upstream testing. Please consult http://wiki.centos.org/FAQ for more information\n", msg); + } + EXPORT_SYMBOL(mark_hardware_unsupported); + +@@ -35,12 +35,12 @@ EXPORT_SYMBOL(mark_hardware_unsupported) + * Called to minimize the support status of a previously supported device in + * a minor release. This does not TAINT the kernel. Marking hardware + * deprecated is usually done in conjunction with the hardware vendor. Future +- * RHEL major releases may not include this driver. Driver updates and fixes ++ * CentOS Linux major releases may not include this driver. Driver updates and fixes + * for this device will be limited to critical issues in future minor releases. + */ + void mark_hardware_deprecated(const char *msg) + { +- pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this RHEL release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact Red Hat Support or your device's hardware vendor for additional information.\n", msg); ++ pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this CentOS Linux release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact CentOS Support or your device's hardware vendor for additional information.\n", msg); + } + EXPORT_SYMBOL(mark_hardware_deprecated); + +@@ -50,9 +50,9 @@ EXPORT_SYMBOL(mark_hardware_deprecated); + * + * Called to minimize the support status of a new driver. This does TAINT the + * kernel. Calling this function indicates that the driver or subsystem has +- * had limited testing and is not marked for full support within this RHEL +- * minor release. The next RHEL minor release may contain full support for +- * this driver. Red Hat does not guarantee that bugs reported against this ++ * had limited testing and is not marked for full support within this CentOS Linux ++ * minor release. The next CentOS Linux minor release may contain full support for ++ * this driver. CentOS does not guarantee that bugs reported against this + * driver or subsystem will be resolved. + */ + void mark_tech_preview(const char *msg, struct module *mod) +@@ -81,13 +81,13 @@ EXPORT_SYMBOL(mark_tech_preview); + * mark_driver_unsupported - drivers that we know we don't want to support + * @name: the name of the driver + * +- * In some cases Red Hat has chosen to build a driver for internal QE ++ * In some cases CentOS has chosen to build a driver for internal QE + * use. Use this function to mark those drivers as unsupported for + * customers. + */ + void mark_driver_unsupported(const char *name) + { +- pr_crit("Warning: %s - This driver has not undergone sufficient testing by Red Hat for this release and therefore cannot be used in production systems.\n", ++ pr_crit("Warning: %s - This driver has not undergone sufficient testing by CentOS for this release and therefore cannot be used in production systems.\n", + name ? name : "kernel"); + } + EXPORT_SYMBOL(mark_driver_unsupported); diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch new file mode 100644 index 0000000..ccd855f --- /dev/null +++ b/SOURCES/debrand-single-cpu.patch @@ -0,0 +1,10 @@ +--- a/arch/x86/kernel/setup.c 2019-03-13 04:04:53.000000000 -0700 ++++ b/arch/x86/kernel/setup.c 2019-05-25 14:01:37.771602628 -0700 +@@ -901,6 +901,7 @@ static void rh_check_supported(void) + !guest && is_kdump_kernel()) { + pr_crit("Detected single cpu native boot.\n"); + pr_crit("Important: In Red Hat Enterprise Linux 8, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems."); ++ pr_crit("Important: In CentOS Linux 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see http://wiki.centos.org/FAQ for more information"); + } + + /* diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey index b1bbe38..d98f8fe 100644 --- a/SOURCES/x509.genkey +++ b/SOURCES/x509.genkey @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = Red Hat -CN = Red Hat Enterprise Linux kernel signing key -emailAddress = secalert@redhat.com +O = CentOS +CN = CentOS Linux kernel signing key +emailAddress = security@centos.org [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 490e1ca..5676975 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -356,13 +356,13 @@ Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz Source11: x509.genkey %if %{?released_kernel} -Source13: securebootca.cer -Source14: secureboot.cer -%define pesign_name redhatsecureboot301 +Source13: centos-ca-secureboot.der +Source14: centossecureboot001.crt +%define pesign_name centossecureboot001 %else -Source13: redhatsecurebootca2.cer -Source14: redhatsecureboot003.cer -%define pesign_name redhatsecureboot003 +Source13: centos-ca-secureboot.der +Source14: centossecureboot001.crt +%define pesign_name centossecureboot001 %endif Source16: mod-extra.list Source17: mod-extra.sh @@ -408,7 +408,13 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 Source2000: cpupower.service Source2001: cpupower.config +# Sources for CentOS debranding +Source9000: centos.pem + ## Patches needed for building this package +Patch1000: debrand-single-cpu.patch +Patch1001: debrand-rh_taint.patch +Patch1002: debrand-rh-i686-cpu.patch # END OF PATCH DEFINITIONS @@ -859,10 +865,16 @@ ApplyOptionalPatch() } %setup -q -n kernel-%{rpmversion}-%{pkgrelease} -c + +cp -v %{SOURCE9000} linux-%{rpmversion}-%{pkgrelease}/certs/rhel.pem mv linux-%{rpmversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} +ApplyOptionalPatch debrand-single-cpu.patch +ApplyOptionalPatch debrand-rh_taint.patch +ApplyOptionalPatch debrand-rh-i686-cpu.patch + # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. @@ -2058,6 +2070,10 @@ fi # # %changelog +* Mon May 27 2019 Fabian Arrotin - 4.18.9-80.el8 +- Rolled in CentOS secureboot cert +- Debranding patches + * Tue May 07 2019 CentOS Sources - 4.18.0-80.el8.centos - Apply debranding changes