keys: change asymmetric keys to use common hash definitions

This patch makes use of the newly defined common hash algorithm info,
replacing, for example, PKEY_HASH with HASH_ALGO.

Changelog:
- Lindent fixes - Mimi

CC: David Howells <dhowells@redhat.com>
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 144201ccba0c..29893162497c 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -154,32 +154,32 @@ int x509_note_pkey_algo(void *context, size_t hdrlen,
                 return -ENOPKG; /* Unsupported combination */
 
         case OID_md4WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_MD5;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_MD5;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
 
         case OID_sha1WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_SHA1;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_SHA1;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
 
         case OID_sha256WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_SHA256;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_SHA256;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
 
         case OID_sha384WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_SHA384;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_SHA384;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
 
         case OID_sha512WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_SHA512;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_SHA512;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
 
         case OID_sha224WithRSAEncryption:
-                ctx->cert->sig.pkey_hash_algo = PKEY_HASH_SHA224;
+                ctx->cert->sig.pkey_hash_algo = HASH_ALGO_SHA224;
                 ctx->cert->sig.pkey_algo = PKEY_ALGO_RSA;
                 break;
         }