summaryrefslogtreecommitdiff
path: root/crypto/asymmetric_keys/mscode_parser.c
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-09-25 10:46:07 -0400
committerDoug Ledford <dledford@redhat.com>2015-09-25 10:46:07 -0400
commita99c59c0accea388f83ea651e90c814aeac04785 (patch)
tree1d102927807aa7c12a8a66cbb59d6560c6520645 /crypto/asymmetric_keys/mscode_parser.c
parentc16e43ca0904ac1f8c20a2c007801d4d69bdb6f7 (diff)
parent733601f243cfd24755f2c120fb9f9ec284fa5ca1 (diff)
downloadlinux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.tar.gz
linux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.zip
Merge tag 'v4.3-rc2' into k.o/for-4.3-v1
Linux 4.3-rc2
Diffstat (limited to 'crypto/asymmetric_keys/mscode_parser.c')
-rw-r--r--crypto/asymmetric_keys/mscode_parser.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/mscode_parser.c b/crypto/asymmetric_keys/mscode_parser.c
index 214a9921..adcef59e 100644
--- a/crypto/asymmetric_keys/mscode_parser.c
+++ b/crypto/asymmetric_keys/mscode_parser.c
@@ -97,6 +97,15 @@ int mscode_note_digest_algo(void *context, size_t hdrlen,
case OID_sha256:
ctx->digest_algo = HASH_ALGO_SHA256;
break;
+ case OID_sha384:
+ ctx->digest_algo = HASH_ALGO_SHA384;
+ break;
+ case OID_sha512:
+ ctx->digest_algo = HASH_ALGO_SHA512;
+ break;
+ case OID_sha224:
+ ctx->digest_algo = HASH_ALGO_SHA224;
+ break;
case OID__NR:
sprint_oid(value, vlen, buffer, sizeof(buffer));