Only a single CRL could be loaded at once. This has been fixed.

Closes #1442. Thanks to charlemagnelasse.
This commit is contained in:
Roger A. Light 2019-10-02 13:37:52 +01:00
parent c471dfb201
commit cfacd961c9
2 changed files with 3 additions and 1 deletions

View File

@ -5,6 +5,8 @@ Broker:
Closes #1437. Closes #1437.
- Fix subscription topics being limited to 200 characters instead of 200 - Fix subscription topics being limited to 200 characters instead of 200
hierarchy levels. Closes #1441. hierarchy levels. Closes #1441.
- Only a single CRL could be loaded at once. This has been fixed.
Closes #1442.
Client library: Client library:
- Fix publish properties not being passed to on_message_v5 callback for QoS 2 - Fix publish properties not being passed to on_message_v5 callback for QoS 2

View File

@ -426,7 +426,7 @@ int net__load_crl_file(struct mosquitto__listener *listener)
} }
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
rc = X509_load_crl_file(lookup, listener->crlfile, X509_FILETYPE_PEM); rc = X509_load_crl_file(lookup, listener->crlfile, X509_FILETYPE_PEM);
if(rc != 1){ if(rc < 1){
log__printf(NULL, MOSQ_LOG_ERR, "Error: Unable to load certificate revocation file \"%s\". Check crlfile.", listener->crlfile); log__printf(NULL, MOSQ_LOG_ERR, "Error: Unable to load certificate revocation file \"%s\". Check crlfile.", listener->crlfile);
net__print_error(MOSQ_LOG_ERR, "Error: %s"); net__print_error(MOSQ_LOG_ERR, "Error: %s");
return 1; return 1;