Commit 3fb8e3f5 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Jarkko Sakkinen
Browse files

pkcs7: parser support SM2 and SM3 algorithms combination 



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 avatarJarkko Sakkinen <jarkko@kernel.org>
parent 1a839502

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;
@@ -277,6 +280,10 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdrlen, 
		ctx->sinfo->sig->pkey_algo = "ecdsa";

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

		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;