]> git.ipfire.org Git - thirdparty/rng-tools.git/commitdiff
rngd: Initialize RNGs in order of preference
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 1 Aug 2012 21:31:40 +0000 (14:31 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 2 Aug 2012 04:19:07 +0000 (00:19 -0400)
The DRNG entropy source, if present, is going to be orders of
magnitudes faster than most other sources, so initialize it
first so that it shows up first in the list.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
rngd.c

diff --git a/rngd.c b/rngd.c
index d7cd1b22706c274409b5f40dcde693c598e96ed2..7fe339865763953bbb9c5e6f8588eb2f59ed194e 100644 (file)
--- a/rngd.c
+++ b/rngd.c
@@ -302,9 +302,9 @@ int main(int argc, char **argv)
        argp_parse(&argp, argc, argv, 0, 0, arguments);
 
        /* Init entropy sources, and open TRNG device */
-       rc_rng = init_entropy_source(&rng_default);
        if (arguments->enable_drng)
                rc_drng = init_drng_entropy_source(&rng_drng);
+       rc_rng = init_entropy_source(&rng_default);
        if (arguments->enable_tpm && rc_rng)
                rc_tpm = init_tpm_entropy_source(&rng_tpm);