OSDN Git Service

crypto: drbg - remove superflowous checks
authorStephan Mueller <smueller@chronox.de>
Sun, 17 Aug 2014 15:38:29 +0000 (17:38 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 25 Aug 2014 12:34:09 +0000 (20:34 +0800)
The crypto_init and crypto_fini functions are always implemented. Thus,
there is no need for a protecting check.

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

index 910e188..212d260 100644 (file)
@@ -1381,11 +1381,9 @@ static int drbg_generate(struct drbg_state *drbg,
                shadow->seeded = false;
 
        /* allocate cipher handle */
-       if (shadow->d_ops->crypto_init) {
-               len = shadow->d_ops->crypto_init(shadow);
-               if (len)
-                       goto err;
-       }
+       len = shadow->d_ops->crypto_init(shadow);
+       if (len)
+               goto err;
 
        if (shadow->pr || !shadow->seeded) {
                pr_devel("DRBG: reseeding before generation (prediction "
@@ -1467,8 +1465,7 @@ static int drbg_generate(struct drbg_state *drbg,
 #endif
 
 err:
-       if (shadow->d_ops->crypto_fini)
-               shadow->d_ops->crypto_fini(shadow);
+       shadow->d_ops->crypto_fini(shadow);
        drbg_restore_shadow(drbg, &shadow);
        return len;
 }
@@ -1562,11 +1559,10 @@ static int drbg_instantiate(struct drbg_state *drbg, struct drbg_string *pers,
                return ret;
 
        ret = -EFAULT;
-       if (drbg->d_ops->crypto_init && drbg->d_ops->crypto_init(drbg))
+       if (drbg->d_ops->crypto_init(drbg))
                goto err;
        ret = drbg_seed(drbg, pers, false);
-       if (drbg->d_ops->crypto_fini)
-               drbg->d_ops->crypto_fini(drbg);
+       drbg->d_ops->crypto_fini(drbg);
        if (ret)
                goto err;