diff options
| author |   henning <henning@openbsd.org> | 2004-12-06 13:14:09 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2004-12-06 13:14:09 +0000 |
| commit | 3c41b1be094c9b9a817ef32af8ba75f896dbaf1b (patch) | |
| tree | 1b83c1ac976a21ef97f2c5391212311ced996415 /usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c | |
| parent | Usage (diff) | |
| download | wireguard-openbsd-3c41b1be094c9b9a817ef32af8ba75f896dbaf1b.tar.xz wireguard-openbsd-3c41b1be094c9b9a817ef32af8ba75f896dbaf1b.zip | |
kill more dead code, mostly inside #ifdef SOMENONSENSEONSTUPIDOSES
joint work by Michael Knudsen <e@molioner.dk> and Daniel Ouellet
<daniel@presscom.net> with my input
no change in binaries
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c')
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c index 9339605ff5a..32a849a09fb 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_rand.c @@ -116,21 +116,15 @@ int ssl_rand_seed(server_rec *s, pool *p, ssl_rsctx_t nCtx, char *prefix) nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes); ssl_util_ppclose(s, p, fp); } -#if SSL_LIBRARY_VERSION >= 0x00905100 else if (pRandSeed->nSrc == SSL_RSSRC_EGD) { /* * seed in contents provided by the external * Entropy Gathering Daemon (EGD) */ -#if SSL_LIBRARY_VERSION >= 0x00906000 if ((n = RAND_egd_bytes(pRandSeed->cpPath, pRandSeed->nBytes)) == -1) -#else - if ((n = RAND_egd(pRandSeed->cpPath)) == -1) -#endif continue; nDone += n; } -#endif else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) { /* * seed in the current time (usually just 4 bytes) @@ -170,10 +164,8 @@ int ssl_rand_seed(server_rec *s, pool *p, ssl_rsctx_t nCtx, char *prefix) } ssl_log(s, SSL_LOG_INFO, "%sSeeding PRNG with %d bytes of entropy", prefix, nDone); -#if SSL_LIBRARY_VERSION >= 0x00905100 if (RAND_status() == 0) ssl_log(s, SSL_LOG_WARN, "%sPRNG still contains insufficient entropy!", prefix); -#endif return nDone; } |