diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2016-01-12 18:02:16 -0600 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-14 13:02:51 -0500 |
| commit | 0423f812dc61f70c6ae6643191259ca9e5692c7f (patch) | |
| tree | 505fd5ca6269bf07f48d4375664ebb2af61aab7e /util | |
| parent | 47153c72536a53ecd8f428444b953db0631acc9b (diff) | |
Add a no-egd option to disable EGD-related code
The entropy-gathering daemon is used only on a small number of machines.
Provide a configure knob so that EGD support can be disabled by default
but re-enabled on those systems that do need it.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/libeay.num | 6 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/util/libeay.num b/util/libeay.num index f388422ae7..8587169c7d 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1754,7 +1754,7 @@ DES_crypt 2249 1_1_0 EXIST::FUNCTION:DES PEM_write_bio_X509_REQ_NEW 2250 1_1_0 EXIST::FUNCTION: PEM_write_X509_REQ_NEW 2251 1_1_0 EXIST::FUNCTION: BIO_callback_ctrl 2252 1_1_0 EXIST::FUNCTION: -RAND_egd 2253 1_1_0 EXIST::FUNCTION: +RAND_egd 2253 1_1_0 EXIST::FUNCTION:EGD RAND_status 2254 1_1_0 EXIST::FUNCTION: bn_dump1 2255 1_1_0 NOEXIST::FUNCTION: DES_check_key_parity 2256 1_1_0 EXIST::FUNCTION:DES @@ -1809,7 +1809,7 @@ X509_ALGOR_cmp 2398 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_set_key_length 2399 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_ctrl 2400 1_1_0 EXIST::FUNCTION: BN_mod_exp_mont_word 2401 1_1_0 EXIST::FUNCTION: -RAND_egd_bytes 2402 1_1_0 EXIST::FUNCTION: +RAND_egd_bytes 2402 1_1_0 EXIST::FUNCTION:EGD X509_REQ_get1_email 2403 1_1_0 EXIST::FUNCTION: X509_get1_email 2404 1_1_0 EXIST::FUNCTION: X509_email_free 2405 1_1_0 EXIST::FUNCTION: @@ -2436,7 +2436,7 @@ X509V3_EXT_nconf_nid 2942 1_1_0 EXIST::FUNCTION: ASN1_SEQUENCE_it 2943 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_SEQUENCE_it 2943 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: UI_set_default_method 2944 1_1_0 EXIST::FUNCTION: -RAND_query_egd_bytes 2945 1_1_0 EXIST::FUNCTION: +RAND_query_egd_bytes 2945 1_1_0 EXIST::FUNCTION:EGD UI_method_get_writer 2946 1_1_0 EXIST::FUNCTION: UI_OpenSSL 2947 1_1_0 EXIST::FUNCTION: PEM_def_callback 2948 1_1_0 EXIST::FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 64ad29adeb..5b79ecd770 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -140,6 +140,7 @@ and [options] can be one of no-srp - No SRP no-ec - No EC no-engine - No engine + no-egd - No EGD no-hw - No hw nasm - Use NASM for x86 asm nw-nasm - Use NASM x86 asm for NetWare @@ -1390,6 +1391,7 @@ sub read_options "no-ec" => \$no_ec, "no-gost" => \$no_gost, "no-engine" => \$no_engine, + "no-egd" => 0, "no-hw" => \$no_hw, "just-ssl" => [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, diff --git a/util/mkdef.pl b/util/mkdef.pl index ff018e9bb8..0ad1a2d3e3 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -84,6 +84,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CRYPTO_MDEBUG", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", + # Entropy Gathering + "EGD", # X.509v3 Signed Certificate Timestamps "SCT", # RFC3779 |