crypto: atmel-sha204a - multiple RNG fixes
v5 cover crypto: atmel-sha204a - multiple RNG fixes
When testing the RNG functionality on the Atmel SHA204a hardware, rngtest reported failures. Fix start of reading and size of fetched data.
I verified and applied Ard's solution (tagged it with sugtgested-by, pls tell me if I used the wrong tag).
---
v3 -> v4: rephrase commit title; fix typos in commit message;
replace index literal by RSP_DATA_IDX
v3 -> v4: Reduce seet and set focus on RNG fix, blocking and nonblocking v2 -> v3: Removal blank line, rebased
v1 -> v2: Removal of C++ style comment
---
Lothar Rubusch (1):
crypto: atmel-sha204a - fix blocking and non-blocking rng logic
drivers/crypto/atmel-sha204a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
base-commit: 5db6ef9847717329f12c5ea8aba7e9f588a980c0
Signature · 1 line
2.53.0
PATCH v5 1/1 crypto: atmel-sha204a - fix blocking and non-blocking rng logic
The blocking and non-blocking paths were failing to provide valid entropy due to improper buffer management. Reading the buffer starting from byte 1, only fetch the 32 bytes of random data from the return message.
Tested on an Atmel SHA204A device.
Before (here for blocking), tests showed repeatedly reading reduced bytes.
$ head -c 32 /dev/hwrng | hexdump -C 00000000 02 28 85 b3 47 40 f2 ee 00 00 00 00 00 00 00 00 |.(..G@..........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000020
After, the result will be similar to the following:
$ head -c 32 /dev/hwrng | hexdump -C 00000000 5a fc 3f 13 14 68 fe 06 68 0a bd 04 83 6e 09 69 |Z.?..h..h....n.i| 00000010 75 ff cf 87 10 84 3b c9 c1 df ae eb 45 53 4c c3 |u.....;.....ESL.| 00000020
--- drivers/crypto/atmel-sha204a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/atmel-sha204a.c +4 -4
@@ -48,8 +48,8 @@ static int atmel_sha204a_rng_read_nonblocking(struct hwrng *rng, void *data,if (rng->priv) { work_data = (struct atmel_i2c_work_data *)rng->priv; - max =min (sizeof (work_data->cmd.data), max); -memcpy (data, &work_data->cmd.data, max); + max =min (RANDOM_RSP_SIZE -CMD_OVERHEAD_SIZE , max); +memcpy (data, &work_data->cmd.data[RSP_DATA_IDX ], max); rng->priv =0 ; }else { work_data =kmalloc_obj (*work_data,GFP_ATOMIC );
@@ -87,8 +87,8 @@ static int atmel_sha204a_rng_read(struct hwrng *rng, void *data, size_t max,if (ret)return ret; - max =min (sizeof (cmd.data), max); -memcpy (data, cmd.data, max); + max =min (RANDOM_RSP_SIZE -CMD_OVERHEAD_SIZE , max); +memcpy (data, &cmd.data[RSP_DATA_IDX ], max);return max; }
Signature · 1 line
2.53.0
Re: [PATCH v5 1/1] crypto: atmel-sha204a - fix blocking and non-blocking rng logic
Quoted 13 lines · Lothar Rubusch
The blocking and non-blocking paths were failing to provide valid entropy due to improper buffer management. Reading the buffer starting from byte 1, only fetch the 32 bytes of random data from the return message.
Tested on an Atmel SHA204A device.
Before (here for blocking), tests showed repeatedly reading reduced bytes.
$ head -c 32 /dev/hwrng | hexdump -C 00000000 02 28 85 b3 47 40 f2 ee 00 00 00 00 00 00 00 00 |.(..G@..........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000020After, the result will be similar to the following:
Quoted 8 lines
$ head -c 32 /dev/hwrng | hexdump -C 00000000 5a fc 3f 13 14 68 fe 06 68 0a bd 04 83 6e 09 69 |Z.?..h..h....n.i| 00000010 75 ff cf 87 10 84 3b c9 c1 df ae eb 45 53 4c c3 |u.....;.....ESL.| 00000020Fixes da001fb651b0 ("crypto: atmel-i2c - add support for SHA204A random number generator")Suggested-by Ard Biesheuvel <[email protected]>Signed-off-by Lothar Rubusch <[email protected]>
Tested on SHA204A hardware using rngtest:
$ sudo head -c 300000 /dev/hwrng | rngtest -c 100 rngtest: FIPS 140-2 successes: 100 rngtest: FIPS 140-2 failures: 0
and verified via hexdump that the byte stream is no longer zero-padded.
Thanks,
Thorsten
Herbert Xu
maintainerRe: [PATCH v5 1/1] crypto: atmel-sha204a - fix blocking and non-blocking rng logic
In reply to Lothar RubuschQuoted 18 lines · Lothar Rubusch
The blocking and non-blocking paths were failing to provide valid entropy due to improper buffer management. Reading the buffer starting from byte 1, only fetch the 32 bytes of random data from the return message.
Tested on an Atmel SHA204A device.
Before (here for blocking), tests showed repeatedly reading reduced bytes.
$ head -c 32 /dev/hwrng | hexdump -C 00000000 02 28 85 b3 47 40 f2 ee 00 00 00 00 00 00 00 00 |.(..G@..........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000020After, the result will be similar to the following:
$ head -c 32 /dev/hwrng | hexdump -C 00000000 5a fc 3f 13 14 68 fe 06 68 0a bd 04 83 6e 09 69 |Z.?..h..h....n.i| 00000010 75 ff cf 87 10 84 3b c9 c1 df ae eb 45 53 4c c3 |u.....;.....ESL.| 00000020
Quoted 6 lines
Fixes da001fb651b0 ("crypto: atmel-i2c - add support for SHA204A random number generator")Suggested-by Ard Biesheuvel <[email protected]>Signed-off-by Lothar Rubusch <[email protected]>--- drivers/crypto/atmel-sha204a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt