summaryrefslogtreecommitdiff
path: root/crypto/asymmetric_keys/mscode_parser.c
diff options
context:
space:
mode:
authorRich Felker <dalias@libc.org>2016-03-29 21:53:03 +0000
committerRich Felker <dalias@libc.org>2016-03-29 21:53:03 +0000
commited8b19a674c67e1007990991d4e02c02da07c952 (patch)
tree230d118992bfd9ac76f80822d34c2f4ea9819a44 /crypto/asymmetric_keys/mscode_parser.c
parent5da64d0814134dc3542fb314a66dcdf74e8553bd (diff)
parentf349a25c7c6b753176540d10e6c243047faefa3a (diff)
downloadlinux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.tar.gz
linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.zip
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'crypto/asymmetric_keys/mscode_parser.c')
-rw-r--r--crypto/asymmetric_keys/mscode_parser.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asymmetric_keys/mscode_parser.c b/crypto/asymmetric_keys/mscode_parser.c
index adcef59e..3242cbfa 100644
--- a/crypto/asymmetric_keys/mscode_parser.c
+++ b/crypto/asymmetric_keys/mscode_parser.c
@@ -86,25 +86,25 @@ int mscode_note_digest_algo(void *context, size_t hdrlen,
oid = look_up_OID(value, vlen);
switch (oid) {
case OID_md4:
- ctx->digest_algo = HASH_ALGO_MD4;
+ ctx->digest_algo = "md4";
break;
case OID_md5:
- ctx->digest_algo = HASH_ALGO_MD5;
+ ctx->digest_algo = "md5";
break;
case OID_sha1:
- ctx->digest_algo = HASH_ALGO_SHA1;
+ ctx->digest_algo = "sha1";
break;
case OID_sha256:
- ctx->digest_algo = HASH_ALGO_SHA256;
+ ctx->digest_algo = "sha256";
break;
case OID_sha384:
- ctx->digest_algo = HASH_ALGO_SHA384;
+ ctx->digest_algo = "sha384";
break;
case OID_sha512:
- ctx->digest_algo = HASH_ALGO_SHA512;
+ ctx->digest_algo = "sha512";
break;
case OID_sha224:
- ctx->digest_algo = HASH_ALGO_SHA224;
+ ctx->digest_algo = "sha224";
break;
case OID__NR: