Re: [PATCH] prng: fix a few misc bugs in prng
From: Herbert Xu
Date: Thu Jul 17 2008 - 03:46:33 EST
On Wed, Jul 16, 2008 at 04:29:16PM -0400, Neil Horman wrote:
>
> Fixing a few misc bugs in prng.c:
> - Remove prng_key/prng_iv from prng_context (both kept in tfm ptr)
> - Making _get_more_prng_bytes return meaningful err codes (not just -1/0)
>
> Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Applied to cryptodev-2.6.
> @@ -369,8 +362,7 @@ int reset_prng_context(struct prng_context *ctx,
>
> ctx->rand_data_valid = DEFAULT_BLK_SZ;
>
> - ret = crypto_blkcipher_setkey(ctx->tfm, ctx->prng_key,
> - strlen(ctx->prng_key));
> + ret = crypto_blkcipher_setkey(ctx->tfm, prng_key, strlen(prng_key));
Please make the length a parameter instead as it's much more
convenient to use a blob as a key rather than a string.
> diff --git a/firmware/Makefile b/firmware/Makefile
> index 809a526..3515814 100644
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@ -34,8 +34,8 @@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
> sb16/ima_adpcm_capture.csp
> fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
> yamaha/ds1e_ctrl.fw
> -fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
> - tigon/tg3_tso5.bin
> +#fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
> +# tigon/tg3_tso5.bin
> fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
> fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
> emi26/bitstream.fw
The dreaded firmware makes a comeback :)
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/