Commit aff64872 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

remove version checks for using EGD 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@93879 13f79535-47bb-0310-9956-ffa450edef68
parent bba714d9

mod_ssl.h

+2 −4
Changes for mod_ssl.h: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -449,10 +449,8 @@ typedef enum { 
typedef enum {

    SSL_RSSRC_BUILTIN = 1,

    SSL_RSSRC_FILE    = 2,

    SSL_RSSRC_EXEC    = 3

#if SSL_LIBRARY_VERSION >= 0x00905100

   ,SSL_RSSRC_EGD     = 4

#endif

    SSL_RSSRC_EXEC    = 3,

    SSL_RSSRC_EGD     = 4

} ssl_rssrc_t;

typedef struct {

    ssl_rsctx_t  nCtx;

ssl_engine_rand.c

+1 −4
Changes for ssl_engine_rand.c: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -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);

                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
@@ -126,7 +125,6 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix) 
                    continue;

                nDone += n;

            }

#endif

            else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {

                struct {

                    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);



#if SSL_LIBRARY_VERSION >= 0x00905100

    if (RAND_status() == 0)

        ssl_log(s, SSL_LOG_WARN, "%sPRNG still contains not sufficient entropy!", prefix);

#endif



    return nDone;

}