mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: temporarily disable DHE

Browse Source 
until make it possible to use generated DH parameters per installation.
This commit is contained in:
Koichiro IWAO 2018-03-03 12:17:27 +09:00
parent 97c21bc972
commit e3d0fd6d46
No known key found for this signature in database
GPG Key ID: 9F72CDBC01BF10EB
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ssl_calls.c
View File

@ -492,6 +492,7 @@ see also
* https://wiki.openssl.org/index.php/Diffie-Hellman_parameters
* https://wiki.openssl.org/index.php/Manual:SSL_CTX_set_tmp_dh_callback(3)
*/
#if 0 /* temprarily disable DHE until make DH parameters not static */
DH *get_dh2236()
{
static unsigned char dh2236_p[] = {
@ -538,6 +539,7 @@ DH *get_dh2236()
}
return dh;
}
#endif
/*****************************************************************************/
struct ssl_tls *
@ -646,6 +648,7 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols,
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_options(self->ctx, options);
#if 0 /* temprarily disable DHE until make DH parameters not static */
DH *dh = get_dh2236();
if (SSL_CTX_set_tmp_dh(self->ctx, dh) != 1)
{
@ -653,6 +656,7 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols,
return 1;
}
DH_free(dh);
#endif
#if defined(SSL_CTX_set_ecdh_auto)
SSL_CTX_set_ecdh_auto(self->ctx, 1);
#endif