Commit 87be4989 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Zheng Zengkai
Browse files

pkcs7: parser support SM2 and SM3 algorithms combination 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I57J1N

Reference: https://lore.kernel.org/all/20210918080737.17252-2-tianjia.zhang@linux.alibaba.com/



--------------------------------

Support parsing the message signature of the SM2 and SM3 algorithm
combination. This group of algorithms has been well supported. One
of the main users is module signature verification.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: default avatarVitaly Chikunov <vt@altlinux.org>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Signed-off-by: default avatarGUO Zihua <guozihua@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 73fed7da

crypto/asymmetric_keys/pkcs7_parser.c

+7 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ int pkcs7_sig_note_digest_algo(void *context, size_t hdrlen, 
	case OID_sha224:

		ctx->sinfo->sig->hash_algo = "sha224";

		break;

	case OID_sm3:

		ctx->sinfo->sig->hash_algo = "sm3";

		break;

	default:

		printk("Unsupported digest algo: %u\n", ctx->last_oid);

		return -ENOPKG;
@@ -269,6 +272,10 @@ 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_SM2_with_SM3:

		ctx->sinfo->sig->pkey_algo = "sm2";

		ctx->sinfo->sig->encoding = "raw";

		break;

	default:

		printk("Unsupported pkey algo: %u\n", ctx->last_oid);

		return -ENOPKG;