[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/25] linux-user: Call qcrypto_init if not using -se
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 13/25] linux-user: Call qcrypto_init if not using -seed |
Date: |
Wed, 22 May 2019 14:42:14 -0400 |
When not using -seed, we will use the crypto subsystem
for random numbers.
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/main.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 7e704845c0..66c909a1a6 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -39,6 +39,7 @@
#include "trace/control.h"
#include "target_elf.h"
#include "cpu_loop-common.h"
+#include "crypto/init.h"
char *exec_path;
@@ -688,17 +689,26 @@ int main(int argc, char **argv, char **envp)
if (seed_optarg == NULL) {
seed_optarg = getenv("QEMU_RAND_SEED");
}
- if (seed_optarg != NULL) {
- unsigned long long seed;
+ {
+ Error *err = NULL;
+ if (seed_optarg != NULL) {
+ unsigned long long seed;
- /* This will go away with the last user of rand(). */
- if (parse_uint_full(seed_optarg, &seed, 0) != 0) {
- fprintf(stderr, "Invalid seed number: %s\n", seed_optarg);
- exit(EXIT_FAILURE);
+ /* This will go away with the last user of rand(). */
+ if (parse_uint_full(seed_optarg, &seed, 0) != 0) {
+ fprintf(stderr, "Invalid seed number: %s\n", seed_optarg);
+ exit(EXIT_FAILURE);
+ }
+ srand(seed);
+
+ qemu_guest_random_seed_main(seed_optarg, &err);
+ } else {
+ qcrypto_init(&err);
+ }
+ if (err) {
+ error_reportf_err(err, "cannot initialize crypto: ");
+ exit(1);
}
- srand(seed);
-
- qemu_guest_random_seed_main(seed_optarg, &error_fatal);
}
target_environ = envlist_to_environ(envlist, NULL);
--
2.17.1
- [Qemu-devel] [PULL 16/25] linux-user: Remove srand call, (continued)
- [Qemu-devel] [PULL 16/25] linux-user: Remove srand call, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 05/25] crypto: Use O_CLOEXEC in qcrypto_random_init, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 06/25] crypto: Use getrandom for qcrypto_random_bytes, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 04/25] crypto: Do not fail for EINTR during qcrypto_random_bytes, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 24/25] target/ppc: Use qemu_guest_getrandom for DARN, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 20/25] hw/misc/exynos4210_rng: Use qemu_guest_getrandom, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 21/25] target/arm: Put all PAC keys into a structure, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 18/25] hw/misc/nrf51_rng: Use qemu_guest_getrandom_nofail, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 14/25] linux-user: Use qemu_guest_getrandom_nofail for AT_RANDOM, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 13/25] linux-user: Call qcrypto_init if not using -seed,
Richard Henderson <=
- [Qemu-devel] [PULL 12/25] linux-user: Initialize pseudo-random seeds for all guest cpus, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 10/25] util: Add qemu_guest_getrandom and associated routines, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 07/25] crypto: Change the qcrypto_random_bytes buffer type to void*, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 02/25] build: Link user-only with crypto random number objects, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 01/25] configure: Link test before auto-enabling crypto libraries, Richard Henderson, 2019/05/22
- Re: [Qemu-devel] [PULL 00/25] Add qemu_getrandom and ARMv8.5-RNG etc, Peter Maydell, 2019/05/23