hunyadi-dev commented on a change in pull request #816:
URL: https://github.com/apache/nifi-minifi-cpp/pull/816#discussion_r446854170
##########
File path: libminifi/src/io/tls/TLSSocket.cpp
##########
@@ -120,35 +115,35 @@ int16_t TLSContext::initialize(bool server_method) {
file.close();
passphrase = password;
}
- SSL_CTX_set_default_passwd_cb(ctx, io::tls::pemPassWordCb);
- SSL_CTX_set_default_passwd_cb_userdata(ctx, &passphrase);
+ SSL_CTX_set_default_passwd_cb(local_context.get(),
io::tls::pemPassWordCb);
+ SSL_CTX_set_default_passwd_cb_userdata(local_context.get(), &passphrase);
}
- int retp = SSL_CTX_use_PrivateKey_file(ctx, privatekey.c_str(),
SSL_FILETYPE_PEM);
+ int retp = SSL_CTX_use_PrivateKey_file(local_context.get(),
privatekey.c_str(), SSL_FILETYPE_PEM);
if (retp != 1) {
logger_->log_error("Could not create load private key,%i on %s error :
%s", retp, privatekey, std::strerror(errno));
error_value = TLS_ERROR_KEY_ERROR;
return error_value;
}
// verify private key
- if (!SSL_CTX_check_private_key(ctx)) {
+ if (!SSL_CTX_check_private_key(local_context.get())) {
logger_->log_error("Private key does not match the public certificate,
error : %s", std::strerror(errno));
error_value = TLS_ERROR_KEY_ERROR;
return error_value;
}
// load CA certificates
if (ssl_service_ != nullptr ||
configure_->get(Configure::nifi_security_client_ca_certificate, caCertificate))
{
- retp = SSL_CTX_load_verify_locations(ctx, caCertificate.c_str(), 0);
+ retp = SSL_CTX_load_verify_locations(local_context.get(),
caCertificate.c_str(), 0);
if (retp == 0) {
logger_->log_error("Can not load CA certificate, Exiting, error : %s",
std::strerror(errno));
error_value = TLS_ERROR_CERT_ERROR;
return error_value;
}
}
- logger_->log_debug("Load/Verify Client Certificate OK. for %X and %X",
this, ctx);
+ logger_->log_debug("Load/Verify Client Certificate OK. for %X and %X",
this, local_context.get());
}
- ctxGuard.disable();
+ ctx.swap(local_context);
Review comment:
Adding manually, as I do not want to split the change into two commits.
The other suggestion has been applied.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
