leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KEYS: Make the X.509 and PKCS7 parsers supply the sig encoding type [ver #2]

Browse Source 
Make the X.509 and PKCS7 parsers fill in the signature encoding type field
recently added to the public_key_signature struct.

Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Marcel Holtmann <marcel@holtmann.org>
Reviewed-by: Marcel Holtmann <marcel@holtmann.org>
Reviewed-by: Denis Kenzior <denkenz@gmail.com>
Tested-by: Denis Kenzior <denkenz@gmail.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
This commit is contained in:
David Howells 2018-10-09 17:47:15 +01:00 committed by James Morris
parent 5a30771832
commit 0398849077
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/asymmetric_keys/pkcs7_parser.c
View File

@ -271,6 +271,7 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdrlen,
switch (ctx->last_oid) { switch (ctx->last_oid) {
case OID_rsaEncryption: case OID_rsaEncryption:
ctx->sinfo->sig->pkey_algo = "rsa"; ctx->sinfo->sig->pkey_algo = "rsa";
ctx->sinfo->sig->encoding = "pkcs1";
break; break;
default: default:
printk("Unsupported pkey algo: %u\n", ctx->last_oid); printk("Unsupported pkey algo: %u\n", ctx->last_oid);

21
crypto/asymmetric_keys/x509_cert_parser.c
View File

@ -199,35 +199,32 @@ int x509_note_pkey_algo(void *context, size_t hdrlen,
case OID_md4WithRSAEncryption: case OID_md4WithRSAEncryption:
ctx->cert->sig->hash_algo = "md4"; ctx->cert->sig->hash_algo = "md4";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
case OID_sha1WithRSAEncryption: case OID_sha1WithRSAEncryption:
ctx->cert->sig->hash_algo = "sha1"; ctx->cert->sig->hash_algo = "sha1";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
case OID_sha256WithRSAEncryption: case OID_sha256WithRSAEncryption:
ctx->cert->sig->hash_algo = "sha256"; ctx->cert->sig->hash_algo = "sha256";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
case OID_sha384WithRSAEncryption: case OID_sha384WithRSAEncryption:
ctx->cert->sig->hash_algo = "sha384"; ctx->cert->sig->hash_algo = "sha384";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
case OID_sha512WithRSAEncryption: case OID_sha512WithRSAEncryption:
ctx->cert->sig->hash_algo = "sha512"; ctx->cert->sig->hash_algo = "sha512";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
case OID_sha224WithRSAEncryption: case OID_sha224WithRSAEncryption:
ctx->cert->sig->hash_algo = "sha224"; ctx->cert->sig->hash_algo = "sha224";
ctx->cert->sig->pkey_algo = "rsa"; goto rsa_pkcs1;
break;
} }
rsa_pkcs1:
ctx->cert->sig->pkey_algo = "rsa";
ctx->cert->sig->encoding = "pkcs1";
ctx->algo_oid = ctx->last_oid; ctx->algo_oid = ctx->last_oid;
return 0; return 0;
} }