Attachment #436360 for bug #565244




   Debug1("SSL_library_init() -> %d", result);
   return result;
}
/*
#if HAVE_SSLv2_client_method
const SSL_METHOD *sycSSLv2_client_method(void) {
   const SSL_METHOD *result;

   Debug1("SSLv3_server_method() -> %p", result);
   return result;
}
*/
const SSL_METHOD *sycSSLv23_client_method(void) {
   const SSL_METHOD *result;
   Debug("SSLv23_client_method()");

   Debug("SSL_free() -> void");
   return;
}
/*
int sycRAND_egd(const char *path) {
   int result;
   Debug1("RAND_egd(\"%s\")", path);

   Debug1("RAND_egd() -> %d", result);
   return result;
}
*/
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
   DH *result;
   Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",

   return result;
}
#endif /* WITH_FIPS */
/*
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
   const COMP_METHOD *result;

   return result;
}
#endif
*/
#endif /* WITH_SYCLS && WITH_OPENSSL */





void sycSSL_load_error_strings(void);
int sycSSL_library_init(void);
//const SSL_METHOD *sycSSLv2_client_method(void);
//const SSL_METHOD *sycSSLv2_server_method(void);
//const SSL_METHOD *sycSSLv3_client_method(void);
//const SSL_METHOD *sycSSLv3_server_method(void);
const SSL_METHOD *sycSSLv23_client_method(void);
const SSL_METHOD *sycSSLv23_server_method(void);
const SSL_METHOD *sycTLSv1_client_method(void);


int sycFIPS_mode_set(int onoff);

/* #if OPENSSL_VERSION_NUMBER >= 0x00908000L
const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
#endif */

#endif /* WITH_OPENSSL */



#define sycSSL_load_error_strings() SSL_load_error_strings()
#define sycSSL_library_init() SSL_library_init()
//#define sycSSLv2_client_method() SSLv2_client_method()
//#define sycSSLv2_server_method() SSLv2_server_method()
//#define sycSSLv3_client_method() SSLv3_client_method()
//#define sycSSLv3_server_method() SSLv3_server_method()
#define sycSSLv23_client_method() SSLv23_client_method()
#define sycSSLv23_server_method() SSLv23_server_method()
#define sycTLSv1_client_method() TLSv1_client_method()





static void openssl_conn_loginfo(SSL *ssl) {
   Notice1("SSL connection using %s", SSL_get_cipher(ssl));
/*
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
   {
      const COMP_METHOD *comp, *expansion;

      Notice1("SSL connection expansion \"%s\"",
              expansion?sycSSL_COMP_get_name(expansion):"none");
   }
#endif */
}

/* the open function for OpenSSL client */

   char *opt_dhparam = NULL;	/* file name of DH params */
   char *opt_cafile = NULL;	/* certificate authority file */
   char *opt_capath = NULL;	/* certificate authority directory */
//   char *opt_egd = NULL;	/* entropy gathering daemon socket path */
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
   char *opt_compress = NULL;	/* compression method */
#endif

   retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
   retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
   retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
//   retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
   retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
   retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);

      }
   }

//   if (opt_egd) {
//      sycRAND_egd(opt_egd);
//   }

   if (opt_pseudo) {
      long int randdata;

Return to bug 565244

Lines 34-40 Link Here

(-)socat-1.7.3.1-orig/sslcls.c (-6 / +6 lines)
34	Debug1("SSL_library_init() -> %d", result);	34	Debug1("SSL_library_init() -> %d", result);
35	return result;	35	return result;
36	}	36	}
37		37	/*
38	#if HAVE_SSLv2_client_method	38	#if HAVE_SSLv2_client_method
39	const SSL_METHOD *sycSSLv2_client_method(void) {	39	const SSL_METHOD *sycSSLv2_client_method(void) {
40	const SSL_METHOD *result;	40	const SSL_METHOD *result;
Lines 70-76 Link Here
70	Debug1("SSLv3_server_method() -> %p", result);	70	Debug1("SSLv3_server_method() -> %p", result);
71	return result;	71	return result;
72	}	72	}
73		73	*/
74	const SSL_METHOD *sycSSLv23_client_method(void) {	74	const SSL_METHOD *sycSSLv23_client_method(void) {
75	const SSL_METHOD *result;	75	const SSL_METHOD *result;
76	Debug("SSLv23_client_method()");	76	Debug("SSLv23_client_method()");
Lines 330-336 Link Here
330	Debug("SSL_free() -> void");	330	Debug("SSL_free() -> void");
331	return;	331	return;
332	}	332	}
333		333	/*
334	int sycRAND_egd(const char *path) {	334	int sycRAND_egd(const char *path) {
335	int result;	335	int result;
336	Debug1("RAND_egd(\"%s\")", path);	336	Debug1("RAND_egd(\"%s\")", path);
Lines 338-344 Link Here
338	Debug1("RAND_egd() -> %d", result);	338	Debug1("RAND_egd() -> %d", result);
339	return result;	339	return result;
340	}	340	}
341		341	*/
342	DH sycPEM_read_bio_DHparams(BIO bp, DH *x, pem_password_cb cb, void *u) {	342	DH sycPEM_read_bio_DHparams(BIO bp, DH *x, pem_password_cb cb, void *u) {
343	DH *result;	343	DH *result;
344	Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",	344	Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
Lines 374-380 Link Here
374	return result;	374	return result;
375	}	375	}
376	#endif /* WITH_FIPS */	376	#endif /* WITH_FIPS */
377		377	/*
378	#if OPENSSL_VERSION_NUMBER >= 0x00908000L	378	#if OPENSSL_VERSION_NUMBER >= 0x00908000L
379	const COMP_METHOD sycSSL_get_current_compression(SSL ssl) {	379	const COMP_METHOD sycSSL_get_current_compression(SSL ssl) {
380	const COMP_METHOD *result;	380	const COMP_METHOD *result;
Lines 412-416 Link Here
412	return result;	412	return result;
413	}	413	}
414	#endif	414	#endif
415		415	*/
416	#endif /* WITH_SYCLS && WITH_OPENSSL */	416	#endif /* WITH_SYCLS && WITH_OPENSSL */

Lines 10-19 Link Here

(-)socat-1.7.3.1-orig/sslcls.h (-10 / +10 lines)
10		10
11	void sycSSL_load_error_strings(void);	11	void sycSSL_load_error_strings(void);
12	int sycSSL_library_init(void);	12	int sycSSL_library_init(void);
13	const SSL_METHOD *sycSSLv2_client_method(void);	13	//const SSL_METHOD *sycSSLv2_client_method(void);
14	const SSL_METHOD *sycSSLv2_server_method(void);	14	//const SSL_METHOD *sycSSLv2_server_method(void);
15	const SSL_METHOD *sycSSLv3_client_method(void);	15	//const SSL_METHOD *sycSSLv3_client_method(void);
16	const SSL_METHOD *sycSSLv3_server_method(void);	16	//const SSL_METHOD *sycSSLv3_server_method(void);
17	const SSL_METHOD *sycSSLv23_client_method(void);	17	const SSL_METHOD *sycSSLv23_client_method(void);
18	const SSL_METHOD *sycSSLv23_server_method(void);	18	const SSL_METHOD *sycSSLv23_server_method(void);
19	const SSL_METHOD *sycTLSv1_client_method(void);	19	const SSL_METHOD *sycTLSv1_client_method(void);
Lines 55-65 Link Here
55		55
56	int sycFIPS_mode_set(int onoff);	56	int sycFIPS_mode_set(int onoff);
57		57
58	#if OPENSSL_VERSION_NUMBER >= 0x00908000L	58	/* #if OPENSSL_VERSION_NUMBER >= 0x00908000L
59	const COMP_METHOD sycSSL_get_current_compression(SSL ssl);	59	const COMP_METHOD sycSSL_get_current_compression(SSL ssl);
60	const COMP_METHOD sycSSL_get_current_expansion(SSL ssl);	60	const COMP_METHOD sycSSL_get_current_expansion(SSL ssl);
61	const char sycSSL_COMP_get_name(const COMP_METHOD comp);	61	const char sycSSL_COMP_get_name(const COMP_METHOD comp);
62	#endif	62	#endif */
63		63
64	#endif /* WITH_OPENSSL */	64	#endif /* WITH_OPENSSL */
65		65
Lines 69-78 Link Here
69		69
70	#define sycSSL_load_error_strings() SSL_load_error_strings()	70	#define sycSSL_load_error_strings() SSL_load_error_strings()
71	#define sycSSL_library_init() SSL_library_init()	71	#define sycSSL_library_init() SSL_library_init()
72	#define sycSSLv2_client_method() SSLv2_client_method()	72	//#define sycSSLv2_client_method() SSLv2_client_method()
73	#define sycSSLv2_server_method() SSLv2_server_method()	73	//#define sycSSLv2_server_method() SSLv2_server_method()
74	#define sycSSLv3_client_method() SSLv3_client_method()	74	//#define sycSSLv3_client_method() SSLv3_client_method()
75	#define sycSSLv3_server_method() SSLv3_server_method()	75	//#define sycSSLv3_server_method() SSLv3_server_method()
76	#define sycSSLv23_client_method() SSLv23_client_method()	76	#define sycSSLv23_client_method() SSLv23_client_method()
77	#define sycSSLv23_server_method() SSLv23_server_method()	77	#define sycSSLv23_server_method() SSLv23_server_method()
78	#define sycTLSv1_client_method() TLSv1_client_method()	78	#define sycTLSv1_client_method() TLSv1_client_method()

Lines 146-152 Link Here

(-)socat-1.7.3.1-orig/xio-openssl.c (-7 / +7 lines)
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;