Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / crypto / asymmetric_keys / x509_public_key.c

diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index c1540e8f454a7df7f8a55beb3bd5bb3689d02341..382ef0d2ff2e5e030c0068d1076155364d48f43d 100644 (file)
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -48,7 +48,7 @@ int x509_get_sig_params(struct x509_certificate *cert)
        /* Allocate the hashing algorithm we're going to need and find out how
         * big the hash operational data will be.
         */
-       tfm = crypto_alloc_shash(pkey_hash_algo_name[cert->sig.pkey_hash_algo], 0, 0);
+       tfm = crypto_alloc_shash(hash_algo_name[cert->sig.pkey_hash_algo], 0, 0);
        if (IS_ERR(tfm))
                return (PTR_ERR(tfm) == -ENOENT) ? -ENOPKG : PTR_ERR(tfm);
 
@@ -124,7 +124,7 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
            cert->sig.pkey_hash_algo >= PKEY_HASH__LAST ||
            !pkey_algo[cert->pub->pkey_algo] ||
            !pkey_algo[cert->sig.pkey_algo] ||
-           !pkey_hash_algo_name[cert->sig.pkey_hash_algo]) {
+           !hash_algo_name[cert->sig.pkey_hash_algo]) {
                ret = -ENOPKG;
                goto error_free_cert;
        }
@@ -140,7 +140,7 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
                 cert->valid_to.tm_min,  cert->valid_to.tm_sec);
        pr_devel("Cert Signature: %s + %s\n",
                 pkey_algo_name[cert->sig.pkey_algo],
-                pkey_hash_algo_name[cert->sig.pkey_hash_algo]);
+                hash_algo_name[cert->sig.pkey_hash_algo]);
 
        if (!cert->fingerprint) {
                pr_warn("Cert for '%s' must have a SubjKeyId extension\n",
@@ -213,3 +213,6 @@ static void __exit x509_key_exit(void)
 
 module_init(x509_key_init);
 module_exit(x509_key_exit);
+
+MODULE_DESCRIPTION("X.509 certificate parser");
+MODULE_LICENSE("GPL");