diff options
| author | Stephan Mueller <smueller@chronox.de> | 2014-08-17 17:38:29 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-08-25 14:34:09 +0200 |
| commit | 45943a58df46b912685af26000e4dbacddd9c567 (patch) | |
| tree | aab609057b65af3ce214081d5e9ec0d6c23cecb7 /crypto | |
| parent | crypto: drbg - kzfree does not need a check for NULL pointer (diff) | |
| download | linux-45943a58df46b912685af26000e4dbacddd9c567.tar.xz linux-45943a58df46b912685af26000e4dbacddd9c567.zip | |
crypto: drbg - remove superflowous checks
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/drbg.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 910e18831916..212d260220e3 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -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; |