mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 59bf6ed4709ea82d63be300814af2c4c94503e14 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
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 <m.novosyolov@rosalinux.ru>
|
|
---
|
|
crypto/asymmetric_keys/pkcs7_parser.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c
|
|
index 967329e0a07b..39c260a04167 100644
|
|
--- a/crypto/asymmetric_keys/pkcs7_parser.c
|
|
+++ b/crypto/asymmetric_keys/pkcs7_parser.c
|
|
@@ -248,6 +248,12 @@ int pkcs7_sig_note_digest_algo(void *context, size_t hdrlen,
|
|
case OID_sha224:
|
|
ctx->sinfo->sig->hash_algo = "sha224";
|
|
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;
|
|
default:
|
|
printk("Unsupported pkey algo: %u\n", ctx->last_oid);
|
|
return -ENOPKG;
|
|
--
|
|
2.17.1
|
|
|