bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added option alias name dhparams

Browse source
This commit is contained in:
Gerhard Rieger 2017-01-08 11:38:18 +01:00
parent 9f41543aad
commit a9f36eb7b7
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -43,6 +43,10 @@ corrections:
and therefore were useless. and therefore were useless.
Thanks to Steve Borenstein for reporting this issue. Thanks to Steve Borenstein for reporting this issue.
Option dhparam was documented as dhparams. Added the alias name
dhparams to fix this.
Thanks to Alexander Neumann for sending a patch.
porting: porting:
Type conflict between int and sig_atomic_t between declaration and Type conflict between int and sig_atomic_t between declaration and
definition of diag_immediate_type and diag_immediate_exit broke definition of diag_immediate_type and diag_immediate_exit broke

2
xioopts.c
View file

@ -375,6 +375,7 @@ const struct optname optionnames[] = {
#endif #endif
IF_OPENSSL("dh", &opt_openssl_dhparam) IF_OPENSSL("dh", &opt_openssl_dhparam)
IF_OPENSSL("dhparam", &opt_openssl_dhparam) IF_OPENSSL("dhparam", &opt_openssl_dhparam)
IF_OPENSSL("dhparams", &opt_openssl_dhparam)
#ifdef O_DIRECT #ifdef O_DIRECT
IF_OPEN ("direct", &opt_o_direct) IF_OPEN ("direct", &opt_o_direct)
#endif #endif
@ -1102,6 +1103,7 @@ const struct optname optionnames[] = {
IF_OPENSSL("openssl-compress", &opt_openssl_compress) IF_OPENSSL("openssl-compress", &opt_openssl_compress)
#endif #endif
IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam)
IF_OPENSSL("openssl-dhparams", &opt_openssl_dhparam)
IF_OPENSSL("openssl-egd", &opt_openssl_egd) IF_OPENSSL("openssl-egd", &opt_openssl_egd)
#if WITH_FIPS #if WITH_FIPS
IF_OPENSSL("openssl-fips", &opt_openssl_fips) IF_OPENSSL("openssl-fips", &opt_openssl_fips)