From 710408dd689e6821f85982ca95ee8188a1671797 Mon Sep 17 00:00:00 2001 From: "kelpee (Sergey)" Date: Tue, 4 Oct 2022 19:39:12 +0300 Subject: [PATCH] 6.0.0-xanmod1 --- ...t-loading-GOST-signed-kernel-modules.patch | 39 ------------------- kernel-xanmod.spec | 2 - 2 files changed, 41 deletions(-) delete mode 100644 0001-crypto-support-loading-GOST-signed-kernel-modules.patch diff --git a/0001-crypto-support-loading-GOST-signed-kernel-modules.patch b/0001-crypto-support-loading-GOST-signed-kernel-modules.patch deleted file mode 100644 index ffd3da7..0000000 --- a/0001-crypto-support-loading-GOST-signed-kernel-modules.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c -From 59bf6ed4709ea82d63be300814af2c4c94503e14 Mon Sep 17 00:00:00 2001 -From: Mikhail Novosyolov -Date: Thu, 6 Aug 2020 14:17:31 +0300 -Subject: [PATCH] crypto: support loading GOST-signed kernel modules -Support loading kernel modules signed with: -* 1.2.643.7.1.1.1.1 id-tc26-gost3410-12-256 -* 1.2.643.7.1.1.1.2 id-tc26-gost3410-12-512 -Signed-off-by: Mikhail Novosyolov ---- - -index 6592279..1316157 100644 ---- a/crypto/asymmetric_keys/pkcs7_parser.c -+++ b/crypto/asymmetric_keys/pkcs7_parser.c -@@ -257,6 +257,12 @@ int pkcs7_sig_note_digest_algo(void *context, size_t hdrlen, - case OID_gost2012Digest512: - ctx->sinfo->sig->hash_algo = "streebog512"; - break; -+ case OID_gost2012Digest256: -+ ctx->sinfo->sig->hash_algo = "streebog256"; -+ break; -+ case OID_gost2012Digest512: -+ ctx->sinfo->sig->hash_algo = "streebog512"; -+ break; - default: - printk("Unsupported digest algo: %u\n", ctx->last_oid); - return -ENOPKG; -@@ -269,6 +275,11 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdrlen, - ctx->sinfo->sig->pkey_algo = "rsa"; - ctx->sinfo->sig->encoding = "pkcs1"; - break; -+ case OID_gost2012PKey256: -+ case OID_gost2012PKey512: -+ ctx->sinfo->sig->pkey_algo = "ecrdsa"; -+ ctx->sinfo->sig->encoding = "raw"; -+ break; - case OID_id_ecdsa_with_sha1: - case OID_id_ecdsa_with_sha224: - case OID_id_ecdsa_with_sha256: diff --git a/kernel-xanmod.spec b/kernel-xanmod.spec index 508f82d..8b4160b 100644 --- a/kernel-xanmod.spec +++ b/kernel-xanmod.spec @@ -288,8 +288,6 @@ Patch111: 0001-Remove-RPM-illegal-chars-from-module-version.patch # sent to upstream, https://patchwork.kernel.org/patch/11446123/ Patch302: 0001-sign-file-full-functionality-with-modern-LibreSSL.patch -# Support loading GOST-signed modules -Patch305: 0001-crypto-support-loading-GOST-signed-kernel-modules.patch # Allow to off modules signature check dynamically Patch306: 0001-ROSA-ima-allow-to-off-modules-signature-check-dynami.patch