mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 01:09:38 -05:00
Code Activity

crypto: rng - RNGs must return 0 in success case

Browse source 
Change the RNGs to always return 0 in success case.

This patch ensures that seqiv.c works with RNGs other than krng. seqiv
expects that any return code other than 0 is an error. Without the
patch, rfc4106(gcm(aes)) will not work when using a DRBG or an ANSI
X9.31 RNG.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Stephan Mueller 2015-03-06 08:26:31 +01:00 • committed by Herbert Xu
parent 4842234f83
commit cde001e4c3
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/ansi_cprng.c
View file

@ -210,7 +210,11 @@ static int get_prng_bytes(char *buf, size_t nbytes, struct prng_context *ctx,
byte_count = DEFAULT_BLK_SZ; byte_count = DEFAULT_BLK_SZ;
} }
err = byte_count; /*
* Return 0 in case of success as mandated by the kernel
* crypto API interface definition.
*/
err = 0;
dbgprint(KERN_CRIT "getting %d random bytes for context %p\n", dbgprint(KERN_CRIT "getting %d random bytes for context %p\n",
byte_count, ctx); byte_count, ctx);

7
crypto/drbg.c
View file

@ -1280,7 +1280,7 @@ static void drbg_restore_shadow(struct drbg_state *drbg,
* as defined in SP800-90A. The additional input is mixed into * as defined in SP800-90A. The additional input is mixed into
* the state in addition to the pulled entropy. * the state in addition to the pulled entropy.
* *
* return: generated number of bytes * return: 0 when all bytes are generated; < 0 in case of an error
*/ */
static int drbg_generate(struct drbg_state *drbg, static int drbg_generate(struct drbg_state *drbg,
unsigned char *buf, unsigned int buflen, unsigned char *buf, unsigned int buflen,
@ -1419,6 +1419,11 @@ static int drbg_generate(struct drbg_state *drbg,
} }
#endif #endif
/*
* All operations were successful, return 0 as mandated by
* the kernel crypto API interface.
*/
len = 0;
err: err:
shadow->d_ops->crypto_fini(shadow); shadow->d_ops->crypto_fini(shadow);
drbg_restore_shadow(drbg, &shadow); drbg_restore_shadow(drbg, &shadow);

3
include/crypto/rng.h
View file

@ -103,8 +103,7 @@ static inline void crypto_free_rng(struct crypto_rng *tfm)
* This function fills the caller-allocated buffer with random numbers using the * This function fills the caller-allocated buffer with random numbers using the
* random number generator referenced by the cipher handle. * random number generator referenced by the cipher handle.
* *
* Return: > 0 function was successful and returns the number of generated * Return: 0 function was successful; < 0 if an error occurred
* bytes; < 0 if an error occurred
*/ */
static inline int crypto_rng_get_bytes(struct crypto_rng *tfm, static inline int crypto_rng_get_bytes(struct crypto_rng *tfm,
u8 *rdata, unsigned int dlen) u8 *rdata, unsigned int dlen)