File tree 12 files changed +0
-56
lines changed
12 files changed +0
-56
lines changed Original file line number Diff line number Diff line change @@ -66,7 +66,6 @@ if(NOT UNIX)
66
66
set (HAVE_GETPWUID 0)
67
67
set (HAVE_GETEUID 0)
68
68
set (HAVE_UTIME 1)
69
- set (HAVE_RAND_EGD 0)
70
69
set (HAVE_GMTIME_R 0)
71
70
set (HAVE_GETHOSTBYNAME_R 0)
72
71
set (HAVE_SIGNAL 1)
Original file line number Diff line number Diff line change 50
50
#
51
51
# The following variables are available:
52
52
# HAVE_SSL_SET0_WBIO: `SSL_set0_wbio` present in OpenSSL
53
- # HAVE_RAND_EGD: `RAND_egd` present in OpenSSL
54
53
# HAVE_AWSLC: OpenSSL is AWS-LC
55
54
# HAVE_BORINGSSL: OpenSSL is BoringSSL
56
55
# HAVE_SSL_CTX_SET_QUIC_METHOD: `SSL_CTX_set_quic_method` present in OpenSSL/wolfSSL
@@ -598,9 +597,6 @@ if(USE_OPENSSL OR USE_WOLFSSL)
598
597
if (NOT DEFINED HAVE_SSL_SET0_WBIO)
599
598
openssl_check_symbol_exists(SSL_set0_wbio "openssl/ssl.h" HAVE_SSL_SET0_WBIO)
600
599
endif ()
601
- if (NOT DEFINED HAVE_RAND_EGD)
602
- openssl_check_symbol_exists(RAND_egd "${CURL_INCLUDES} " HAVE_RAND_EGD)
603
- endif ()
604
600
endif ()
605
601
606
602
option (USE_NGHTTP2 "Use Nghttp2 library" OFF )
Original file line number Diff line number Diff line change 40
40
#define HAVE_NETINET_IN_H 1
41
41
#define HAVE_NET_IF_H 1
42
42
#define HAVE_PWD_H 1
43
- #define HAVE_RAND_EGD 1
44
43
#define HAVE_SELECT 1
45
44
#define HAVE_SETJMP_H 1
46
45
#define HAVE_SIGNAL 1
Original file line number Diff line number Diff line change 77
77
78
78
#define CURL_DISABLE_LDAP 1
79
79
80
- #define HAVE_RAND_EGD 1
81
-
82
80
#define HAVE_IOCTL_FIONBIO 1
83
81
84
82
#define SIZEOF_INT 4
Original file line number Diff line number Diff line change 68
68
/* Define this as a suitable file to read random data from */
69
69
#undef RANDOM_FILE
70
70
71
- /* Define this to your Entropy Gathering Daemon socket pathname */
72
- #undef EGD_SOCKET
73
-
74
71
/* Define to 1 if you have the alarm function. */
75
72
#define HAVE_ALARM 1
76
73
143
140
/* Define if you have the <pwd.h> header file. */
144
141
#define HAVE_PWD_H
145
142
146
- /* Define if you have the `RAND_egd' function. */
147
- #undef HAVE_RAND_EGD
148
-
149
143
/* Define if you have the `select' function. */
150
144
#define HAVE_SELECT
151
145
Original file line number Diff line number Diff line change 66
66
/* Define this as a suitable file to read random data from */
67
67
#undef RANDOM_FILE
68
68
69
- /* Define this to your Entropy Gathering Daemon socket pathname */
70
- #undef EGD_SOCKET
71
-
72
69
/* Define if you want to enable IPv6 support */
73
70
#undef ENABLE_IPV6
74
71
135
132
/* Define if you have the <pwd.h> header file. */
136
133
#undef HAVE_PWD_H
137
134
138
- /* Define if you have the `RAND_egd' function. */
139
- #undef HAVE_RAND_EGD
140
-
141
135
/* Define if you have the `select' function. */
142
136
#define HAVE_SELECT
143
137
Original file line number Diff line number Diff line change 135
135
/* Use Windows LDAP implementation */
136
136
#cmakedefine USE_WIN32_LDAP 1
137
137
138
- /* your Entropy Gathering Daemon socket pathname */
139
- #cmakedefine EGD_SOCKET ${EGD_SOCKET}
140
-
141
138
/* Define if you want to enable IPv6 support */
142
139
#cmakedefine ENABLE_IPV6 1
143
140
400
397
/* Define to 1 if OpenSSL has the `SSL_set0_wbio` function. */
401
398
#cmakedefine HAVE_SSL_SET0_WBIO 1
402
399
403
- /* Define to 1 if you have the `RAND_egd' function. */
404
- #cmakedefine HAVE_RAND_EGD 1
405
-
406
400
/* Define to 1 if you have the recv function. */
407
401
#cmakedefine HAVE_RECV 1
408
402
Original file line number Diff line number Diff line change @@ -262,7 +262,6 @@ static struct passwd *vms_getpwuid(uid_t uid)
262
262
#define PKCS12_parse PKCS12_PARSE
263
263
#define RAND_add RAND_ADD
264
264
#define RAND_bytes RAND_BYTES
265
- #define RAND_egd RAND_EGD
266
265
#define RAND_file_name RAND_FILE_NAME
267
266
#define RAND_load_file RAND_LOAD_FILE
268
267
#define RAND_status RAND_STATUS
Original file line number Diff line number Diff line change @@ -996,20 +996,6 @@ static CURLcode ossl_seed(struct Curl_easy *data)
996
996
return CURLE_OK ;
997
997
#endif
998
998
999
- #if defined(HAVE_RAND_EGD ) && defined(EGD_SOCKET )
1000
- /* available in OpenSSL 0.9.5 and later */
1001
- /* EGD_SOCKET is set at configure time or not at all */
1002
- {
1003
- /* If there's an option and a define, the option overrides the
1004
- define */
1005
- int ret = RAND_egd (EGD_SOCKET );
1006
- if (-1 != ret ) {
1007
- if (rand_enough ())
1008
- return CURLE_OK ;
1009
- }
1010
- }
1011
- #endif
1012
-
1013
999
/* fallback to a custom seeding of the PRNG using a hash based on a current
1014
1000
time */
1015
1001
do {
Original file line number Diff line number Diff line change @@ -259,8 +259,6 @@ if test "x$OPT_OPENSSL" != xno; then
259
259
if test X"$OPENSSL_ENABLED" = X"1"; then
260
260
dnl These can only exist if OpenSSL exists
261
261
262
- AC_CHECK_FUNCS ( RAND_egd )
263
-
264
262
AC_MSG_CHECKING ( [ for BoringSSL] )
265
263
AC_COMPILE_IFELSE ( [
266
264
AC_LANG_PROGRAM ( [ [
@@ -363,16 +361,6 @@ dnl Check for the random seed preferences
363
361
dnl **********************************************************************
364
362
365
363
if test X"$OPENSSL_ENABLED" = X"1"; then
366
- AC_ARG_WITH ( egd-socket ,
367
- AS_HELP_STRING ( [ --with-egd-socket=FILE] ,
368
- [ Entropy Gathering Daemon socket pathname] ) ,
369
- [ EGD_SOCKET="$withval" ]
370
- )
371
- if test -n "$EGD_SOCKET" ; then
372
- AC_DEFINE_UNQUOTED ( EGD_SOCKET , "$EGD_SOCKET" ,
373
- [ your Entropy Gathering Daemon socket pathname] )
374
- fi
375
-
376
364
dnl Check for user-specified random device
377
365
AC_ARG_WITH ( random ,
378
366
AS_HELP_STRING ( [ --with-random=FILE] ,
Original file line number Diff line number Diff line change @@ -33,7 +33,6 @@ char SSL_connect(void) {return 0;}
33
33
char ENGINE_init(void) {return 0;}
34
34
char RAND_status(void) {return 0;}
35
35
/* char RAND_screen(void) {return 0;} In headers, but not present */
36
- char RAND_egd(void) {return 0;}
37
36
char CRYPTO_cleanup_all_ex_data(void) {return 0;}
38
37
char SSL_get_shutdown(void) {return 0;}
39
38
char ENGINE_load_builtin_engines (void) {return 0;}
@@ -46,7 +45,6 @@ char ENGINE_load_builtin_engines (void) {return 0;}
46
45
#define ENGINE_init ENGINE_INIT
47
46
#define RAND_status RAND_STATUS
48
47
/* #define RAND_screen RAND_SCREEN */
49
- #define RAND_egd RAND_EGD
50
48
#define CRYPTO_cleanup_all_ex_data CRYPTO_CLEANUP_ALL_EX_DATA
51
49
#define SSL_get_shutdown SSL_GET_SHUTDOWN
52
50
#define ENGINE_load_builtin_engines ENGINE_LOAD_BUILTIN_ENGINES
Original file line number Diff line number Diff line change 83
83
' zstd' => 1,
84
84
' brotli' => 1,
85
85
' random' => 1,
86
- ' egd-socket' => 1,
87
86
' ca-bundle' => 1,
88
87
' ca-path' => 1,
89
88
' libssh2' => 1,
You can’t perform that action at this time.
0 commit comments