Lines 146-152
Link Here
|
146 |
|
146 |
|
147 |
static void openssl_conn_loginfo(SSL *ssl) { |
147 |
static void openssl_conn_loginfo(SSL *ssl) { |
148 |
Notice1("SSL connection using %s", SSL_get_cipher(ssl)); |
148 |
Notice1("SSL connection using %s", SSL_get_cipher(ssl)); |
149 |
|
149 |
/* |
150 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
150 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
151 |
{ |
151 |
{ |
152 |
const COMP_METHOD *comp, *expansion; |
152 |
const COMP_METHOD *comp, *expansion; |
Lines 159-165
Link Here
|
159 |
Notice1("SSL connection expansion \"%s\"", |
159 |
Notice1("SSL connection expansion \"%s\"", |
160 |
expansion?sycSSL_COMP_get_name(expansion):"none"); |
160 |
expansion?sycSSL_COMP_get_name(expansion):"none"); |
161 |
} |
161 |
} |
162 |
#endif |
162 |
#endif */ |
163 |
} |
163 |
} |
164 |
|
164 |
|
165 |
/* the open function for OpenSSL client */ |
165 |
/* the open function for OpenSSL client */ |
Lines 722-728
Link Here
|
722 |
char *opt_dhparam = NULL; /* file name of DH params */ |
722 |
char *opt_dhparam = NULL; /* file name of DH params */ |
723 |
char *opt_cafile = NULL; /* certificate authority file */ |
723 |
char *opt_cafile = NULL; /* certificate authority file */ |
724 |
char *opt_capath = NULL; /* certificate authority directory */ |
724 |
char *opt_capath = NULL; /* certificate authority directory */ |
725 |
char *opt_egd = NULL; /* entropy gathering daemon socket path */ |
725 |
// char *opt_egd = NULL; /* entropy gathering daemon socket path */ |
726 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
726 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
727 |
char *opt_compress = NULL; /* compression method */ |
727 |
char *opt_compress = NULL; /* compression method */ |
728 |
#endif |
728 |
#endif |
Lines 741-747
Link Here
|
741 |
retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); |
741 |
retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); |
742 |
retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); |
742 |
retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); |
743 |
retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); |
743 |
retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); |
744 |
retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); |
744 |
// retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); |
745 |
retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); |
745 |
retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); |
746 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
746 |
#if OPENSSL_VERSION_NUMBER >= 0x00908000L |
747 |
retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); |
747 |
retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); |
Lines 877-885
Link Here
|
877 |
} |
877 |
} |
878 |
} |
878 |
} |
879 |
|
879 |
|
880 |
if (opt_egd) { |
880 |
// if (opt_egd) { |
881 |
sycRAND_egd(opt_egd); |
881 |
// sycRAND_egd(opt_egd); |
882 |
} |
882 |
// } |
883 |
|
883 |
|
884 |
if (opt_pseudo) { |
884 |
if (opt_pseudo) { |
885 |
long int randdata; |
885 |
long int randdata; |