diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-08-15 15:50:14 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-08-15 16:45:32 -0400 |
| commit | b35ef02628b48d7041cdb8961e931dbe5e10d169 (patch) | |
| tree | ee22108fbafa634703f0940fe254c006ec5dcdfc | |
| parent | 1fcb6a3daa3da1f6baa4cc5b4092642c6bf5103c (diff) | |
Print pathnames for 'version -r'
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4168)
| -rw-r--r-- | apps/version.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/apps/version.c b/apps/version.c index 298d837f5a..c9727daf52 100644 --- a/apps/version.c +++ b/apps/version.c @@ -49,6 +49,16 @@ const OPTIONS version_options[] = { {NULL} }; +#if defined(OPENSSL_RAND_SEED_DEVRANDOM) || defined(OPENSSL_RAND_SEED_EGD) +static void printlist(const char *prefix, const char **dev) +{ + printf("%s (", prefix); + for ( ; *dev != NULL; dev++) + printf(" \"%s\"", *dev); + printf(" )"); +} +#endif + int version_main(int argc, char **argv) { int ret = 1, dirty = 0, seed = 0; @@ -143,7 +153,7 @@ int version_main(int argc, char **argv) printf(" rtdsc"); #endif #ifdef OPENSSL_RAND_SEED_RDCPU - printf(" rdrand-hardware"); + printf(" rdrand ( rdseed rdrand )"); #endif #ifdef OPENSSL_RAND_SEED_LIBRANDOM printf(" C-library-random"); @@ -152,10 +162,16 @@ int version_main(int argc, char **argv) printf(" getrandom-syscall"); #endif #ifdef OPENSSL_RAND_SEED_DEVRANDOM - printf(" random-device"); + { + static const char *dev[] = { DEVRANDOM, NULL }; + printlist(" random-device", dev); + } #endif #ifdef OPENSSL_RAND_SEED_EGD - printf(" EGD"); + { + static const char *dev[] = { DEVRANDOM_EGD, NULL }; + printlist(" EGD", dev); + } #endif #ifdef OPENSSL_RAND_SEED_NONE printf(" none"); |