VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove version checks for using EGD

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93879 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-12 22:11:51 +00:00
parent e77f92b4e5
commit bed8256dc1
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ssl/mod_ssl.h
View File

@ -449,10 +449,8 @@ typedef enum {
typedef enum { typedef enum {
SSL_RSSRC_BUILTIN = 1, SSL_RSSRC_BUILTIN = 1,
SSL_RSSRC_FILE = 2, SSL_RSSRC_FILE = 2,
SSL_RSSRC_EXEC = 3 SSL_RSSRC_EXEC = 3,
#if SSL_LIBRARY_VERSION >= 0x00905100 SSL_RSSRC_EGD = 4
,SSL_RSSRC_EGD = 4
#endif
} ssl_rssrc_t; } ssl_rssrc_t;
typedef struct { typedef struct {
ssl_rsctx_t nCtx; ssl_rsctx_t nCtx;

5
modules/ssl/ssl_engine_rand.c
View File

@ -116,7 +116,6 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes); nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
ssl_util_ppclose(s, p, fp); ssl_util_ppclose(s, p, fp);
} }
#if SSL_LIBRARY_VERSION >= 0x00905100
else if (pRandSeed->nSrc == SSL_RSSRC_EGD) { else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
/* /*
* seed in contents provided by the external * seed in contents provided by the external
@ -126,7 +125,6 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
continue; continue;
nDone += n; nDone += n;
} }
#endif
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) { else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
struct { struct {
time_t t; time_t t;
@ -159,10 +157,9 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
} }
ssl_log(s, SSL_LOG_INFO, "%sSeeding PRNG with %d bytes of entropy", prefix, nDone); ssl_log(s, SSL_LOG_INFO, "%sSeeding PRNG with %d bytes of entropy", prefix, nDone);
#if SSL_LIBRARY_VERSION >= 0x00905100
if (RAND_status() == 0) if (RAND_status() == 0)
ssl_log(s, SSL_LOG_WARN, "%sPRNG still contains not sufficient entropy!", prefix); ssl_log(s, SSL_LOG_WARN, "%sPRNG still contains not sufficient entropy!", prefix);
#endif
return nDone; return nDone;
} }