d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use of --ciphers no longer requires you to also pass --tls-version.

Browse Source 
Closes #380.

Bug: https://github.com/eclipse/mosquitto/issues/380
This commit is contained in:
Roger A. Light 2017-02-15 21:01:49 +00:00
parent ebad302119
commit 10c89751fa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -8,6 +8,10 @@ Broker:
- Fix error message when websockets http_dir directory does not exist. - Fix error message when websockets http_dir directory does not exist.
- Improve password utility error message. Closes #379. - Improve password utility error message. Closes #379.
Clients:
- Use of --ciphers no longer requires you to also pass --tls-version.
Closes #380.
Client library: Client library:
- Clients can now use TLS with IPv6. - Clients can now use TLS with IPv6.
- Fix potential socket leakage when reconnecting. Closes #304. - Fix potential socket leakage when reconnecting. Closes #304.

2
client/client_shared.c
View File

@ -690,7 +690,7 @@ int client_opts_set(struct mosquitto *mosq, struct mosq_config *cfg)
return 1; return 1;
} }
# endif # endif
if(cfg->tls_version && mosquitto_tls_opts_set(mosq, 1, cfg->tls_version, cfg->ciphers)){ if((cfg->tls_version || cfg->ciphers) && mosquitto_tls_opts_set(mosq, 1, cfg->tls_version, cfg->ciphers)){
if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS options.\n"); if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
mosquitto_lib_cleanup(); mosquitto_lib_cleanup();
return 1; return 1;