OSDN Git Service

crypto: drbg - remove unnecessary sanity checks
authorStephan Mueller <smueller@chronox.de>
Sun, 17 Aug 2014 15:40:20 +0000 (17:40 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 25 Aug 2014 12:34:11 +0000 (20:34 +0800)
The drbg_make_shadow function contains sanity checks which are not
needed as the function is invoked at times where it is ensured that the
checked-for variables are available.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/drbg.c

index ebe0afc..7015757 100644 (file)
@@ -1263,15 +1263,6 @@ static int drbg_make_shadow(struct drbg_state *drbg, struct drbg_state **shadow)
        int ret = -ENOMEM;
        struct drbg_state *tmp = NULL;
 
-       if (!drbg || !drbg->core || !drbg->V || !drbg->C) {
-               pr_devel("DRBG: attempt to generate shadow copy for "
-                        "uninitialized DRBG state rejected\n");
-               return -EINVAL;
-       }
-       /* HMAC does not have a scratchpad */
-       if (!(drbg->core->flags & DRBG_HMAC) && NULL == drbg->scratchpad)
-               return -EINVAL;
-
        tmp = kzalloc(sizeof(struct drbg_state), GFP_KERNEL);
        if (!tmp)
                return -ENOMEM;