OSDN Git Service

crypto: user - remove redundant reporting functions
authorEric Biggers <ebiggers@google.com>
Sat, 3 Nov 2018 21:56:02 +0000 (14:56 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 9 Nov 2018 09:41:39 +0000 (17:41 +0800)
The acomp, akcipher, and kpp algorithm types already have .report
methods defined, so there's no need to duplicate this functionality in
crypto_user itself; the duplicate functions are actually never executed.
Remove the unused code.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/crypto_user_base.c

index 784748d..1ecd9b0 100644 (file)
@@ -113,51 +113,6 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
-{
-       struct crypto_report_acomp racomp;
-
-       strncpy(racomp.type, "acomp", sizeof(racomp.type));
-
-       if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,
-                   sizeof(struct crypto_report_acomp), &racomp))
-               goto nla_put_failure;
-       return 0;
-
-nla_put_failure:
-       return -EMSGSIZE;
-}
-
-static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
-{
-       struct crypto_report_akcipher rakcipher;
-
-       strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
-
-       if (nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,
-                   sizeof(struct crypto_report_akcipher), &rakcipher))
-               goto nla_put_failure;
-       return 0;
-
-nla_put_failure:
-       return -EMSGSIZE;
-}
-
-static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
-{
-       struct crypto_report_kpp rkpp;
-
-       strncpy(rkpp.type, "kpp", sizeof(rkpp.type));
-
-       if (nla_put(skb, CRYPTOCFGA_REPORT_KPP,
-                   sizeof(struct crypto_report_kpp), &rkpp))
-               goto nla_put_failure;
-       return 0;
-
-nla_put_failure:
-       return -EMSGSIZE;
-}
-
 static int crypto_report_one(struct crypto_alg *alg,
                             struct crypto_user_alg *ualg, struct sk_buff *skb)
 {
@@ -202,20 +157,6 @@ static int crypto_report_one(struct crypto_alg *alg,
                        goto nla_put_failure;
 
                break;
-       case CRYPTO_ALG_TYPE_ACOMPRESS:
-               if (crypto_report_acomp(skb, alg))
-                       goto nla_put_failure;
-
-               break;
-       case CRYPTO_ALG_TYPE_AKCIPHER:
-               if (crypto_report_akcipher(skb, alg))
-                       goto nla_put_failure;
-
-               break;
-       case CRYPTO_ALG_TYPE_KPP:
-               if (crypto_report_kpp(skb, alg))
-                       goto nla_put_failure;
-               break;
        }
 
 out: