fgerlits commented on a change in pull request #947: URL: https://github.com/apache/nifi-minifi-cpp/pull/947#discussion_r537345098
########## File path: libminifi/include/utils/tls/CertificateUtils.h ########## @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once +#ifdef OPENSSL_SUPPORT + +#include <openssl/ssl.h> + +#ifdef WIN32 +#include <windows.h> +#include <wincrypt.h> +#endif // WIN32 + +#include <memory> + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace utils { +namespace tls { + +struct EVP_PKEY_deleter { + void operator()(EVP_PKEY* pkey) const { EVP_PKEY_free(pkey); } +}; +using EVP_PKEY_unique_ptr = std::unique_ptr<EVP_PKEY, EVP_PKEY_deleter>; + +struct X509_deleter { + void operator()(X509* cert) const { X509_free(cert); } Review comment: I have replaced `X509_free()` with `X509_unique_ptr` in `SourceInitiatedSubscriptionListener.cpp` (although this is part of the openwsman extension, which is disabled by default and does not compile at the moment -- I will fix that in a later PR.) In `SSLContextService::addP12CertificateToSSLContext()`, I would have to replace ```c++ const auto certs_guard = gsl::finally([pkey, cert, ca]() { EVP_PKEY_free(pkey); X509_free(cert); sk_X509_pop_free(ca, X509_free); }); ``` with ```c++ utils::tls::EVP_PKEY_unique_ptr pkey_ptr{pkey}; utils::tls::X509_unique_ptr cert_ptr{cert}; const auto ca_deleter = gsl::finally([ca] { sk_X509_pop_free(ca, X509_free); }); ``` ie., introduce 3 deleter variables instead of 1. Do you think that is worth it? ---------------------------------------------------------------- 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: [email protected]
