hunyadi-dev commented on a change in pull request #816:
URL: https://github.com/apache/nifi-minifi-cpp/pull/816#discussion_r446841976
##########
File path: libminifi/src/io/tls/TLSSocket.cpp
##########
@@ -72,30 +72,25 @@ int16_t TLSContext::initialize(bool server_method) {
}
const SSL_METHOD *method;
method = server_method ? TLSv1_2_server_method() : TLSv1_2_client_method();
- ctx = SSL_CTX_new(method);
- if (ctx == nullptr) {
+ Context local_context = Context(SSL_CTX_new(method), deleteContext);
+ if (local_context == nullptr) {
logger_->log_error("Could not create SSL context, error: %s.",
std::strerror(errno));
error_value = TLS_ERROR_CONTEXT;
return error_value;
}
- utils::ScopeGuard ctxGuard([this]() {
- SSL_CTX_free(ctx);
- ctx = nullptr;
- });
-
if (needClientCert) {
std::string certificate;
std::string privatekey;
std::string passphrase;
std::string caCertificate;
if (ssl_service_ != nullptr) {
- if (!ssl_service_->configure_ssl_context(ctx)) {
+ if (!ssl_service_->configure_ssl_context(local_context.get())) {
error_value = TLS_ERROR_CERT_ERROR;
return error_value;
}
- 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.
##########
File path: libminifi/include/io/tls/TLSSocket.h
##########
@@ -80,10 +77,13 @@ class TLSContext : public SocketContext {
int16_t initialize(bool server_method = false);
private:
+ static void deleteContext(SSL_CTX* ptr) { SSL_CTX_free(ptr); }
+
std::shared_ptr<logging::Logger> logger_;
std::shared_ptr<Configure> configure_;
std::shared_ptr<minifi::controllers::SSLContextService> ssl_service_;
- SSL_CTX *ctx;
+ using Context = std::unique_ptr<SSL_CTX, decltype(&deleteContext)>;
+ Context ctx;
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
