Fixed build for openssl compiled with OPENSSL_NO_ENGINE.

Closes #2589. Thanks to Dirk Feytons.
pull/2621/head
Roger A. Light 3 years ago
parent a146c218ad
commit 8c0600c40c

@ -55,6 +55,7 @@ Broker:
- Fix mosquitto_plugin.h not including mosquitto_broker.h. Closes #2350. - Fix mosquitto_plugin.h not including mosquitto_broker.h. Closes #2350.
- Fix unlimited message quota not being properly checked for incoming - Fix unlimited message quota not being properly checked for incoming
messages. Closes #2593. messages. Closes #2593.
- Fixed build for openssl compiled with OPENSSL_NO_ENGINE. Closes #2589.
Client library: Client library:
- Initialise sockpairR/W to invalid in `mosquitto_reinitialise()` to avoid - Initialise sockpairR/W to invalid in `mosquitto_reinitialise()` to avoid

@ -570,7 +570,7 @@ int net__tls_load_verify(struct mosquitto__listener *listener)
#ifdef WITH_TLS #ifdef WITH_TLS
int rc; int rc;
#if OPENSSL_VERSION_NUMBER < 0x30000000L # if OPENSSL_VERSION_NUMBER < 0x30000000L
if(listener->cafile || listener->capath){ if(listener->cafile || listener->capath){
rc = SSL_CTX_load_verify_locations(listener->ssl_ctx, listener->cafile, listener->capath); rc = SSL_CTX_load_verify_locations(listener->ssl_ctx, listener->cafile, listener->capath);
if(rc == 0){ if(rc == 0){
@ -583,7 +583,7 @@ int net__tls_load_verify(struct mosquitto__listener *listener)
} }
} }
} }
#else # else
if(listener->cafile){ if(listener->cafile){
rc = SSL_CTX_load_verify_file(listener->ssl_ctx, listener->cafile); rc = SSL_CTX_load_verify_file(listener->ssl_ctx, listener->cafile);
if(rc == 0){ if(rc == 0){
@ -600,11 +600,13 @@ int net__tls_load_verify(struct mosquitto__listener *listener)
return MOSQ_ERR_TLS; return MOSQ_ERR_TLS;
} }
} }
#endif # endif
# if !defined(OPENSSL_NO_ENGINE)
if(net__load_engine(listener)){ if(net__load_engine(listener)){
return MOSQ_ERR_TLS; return MOSQ_ERR_TLS;
} }
# endif
#endif #endif
return net__load_certificates(listener); return net__load_certificates(listener);
} }

Loading…
Cancel
Save