Skip to content

Fix coverity warnings #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristelmerilain merged 1 commit into from
Mar 11, 2025
Merged

Fix coverity warnings #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/crypto/OpenSSLHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
namespace digidoc
{

#define SCOPE_PTR(TYPE, DATA) make_unique_ptr<TYPE>(DATA, TYPE##_free)
#define SCOPE_PTR(TYPE, DATA) make_unique_ptr<TYPE##_free>(DATA)
#define SCOPE(TYPE, VAR, DATA) auto VAR = make_unique_ptr<TYPE>(DATA, TYPE##_free)

template<auto F, class T>
Expand Down
33 changes: 14 additions & 19 deletions src/crypto/X509Cert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@
#include "X509Cert.h"

#include "crypto/OpenSSLHelpers.h"
#include "crypto/X509Crypto.h"
#include "util/log.h"

#include <openssl/asn1t.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>

#include <functional>

using namespace digidoc;
using namespace std;

Expand Down Expand Up @@ -229,7 +226,7 @@ X509Cert::X509Cert(const unsigned char *bytes, size_t size, Format format)
}
else
{
SCOPE(BIO, bio, BIO_new_mem_buf((void*)bytes, int(size)));
auto bio = make_unique_ptr<BIO_free>(BIO_new_mem_buf((void*)bytes, int(size)));
cert.reset(PEM_read_bio_X509(bio.get(), nullptr, nullptr, nullptr), X509_free);
}
if(!cert)
Expand All @@ -247,7 +244,7 @@ X509Cert::X509Cert(const string &path, Format format)
{
if(path.empty())
THROW("No path given to parse X509.");
SCOPE(BIO, bio, BIO_new_file(path.c_str(), "rb"));
auto bio = make_unique_ptr<BIO_free>(BIO_new_file(path.c_str(), "rb"));
if(!bio)
THROW_OPENSSLEXCEPTION("Failed to open X.509 certificate file '%s'", path.c_str());
if(format == Der)
Expand Down Expand Up @@ -298,7 +295,7 @@ string X509Cert::serial() const
{
if(!cert)
return {};
if(auto bn = make_unique_ptr(ASN1_INTEGER_to_BN(X509_get_serialNumber(cert.get()), nullptr), BN_free))
if(auto bn = make_unique_ptr<BN_free>(ASN1_INTEGER_to_BN(X509_get_serialNumber(cert.get()), nullptr)))
{
auto openssl_free = [](char *data) { OPENSSL_free(data); };
if(auto str = unique_ptr<char,decltype(openssl_free)>(BN_bn2dec(bn.get()), openssl_free))
Expand Down Expand Up @@ -327,7 +324,7 @@ vector<X509Cert::KeyUsage> X509Cert::keyUsage() const
vector<KeyUsage> usage;
if(!cert)
return usage;
SCOPE(ASN1_BIT_STRING, keyusage, X509_get_ext_d2i(cert.get(), NID_key_usage, nullptr, nullptr));
auto keyusage = make_unique_cast<ASN1_BIT_STRING_free>(X509_get_ext_d2i(cert.get(), NID_key_usage, nullptr, nullptr));
if(!keyusage)
return usage;

Expand All @@ -347,7 +344,7 @@ vector<string> X509Cert::certificatePolicies() const
vector<string> pol;
if(!cert)
return pol;
SCOPE(CERTIFICATEPOLICIES, cp, X509_get_ext_d2i(cert.get(), NID_certificate_policies, nullptr, nullptr));
auto cp = make_unique_cast<CERTIFICATEPOLICIES_free>(X509_get_ext_d2i(cert.get(), NID_certificate_policies, nullptr, nullptr));
if(!cp)
return pol;
for(int i = 0; i < sk_POLICYINFO_num(cp.get()); ++i)
Expand All @@ -367,7 +364,7 @@ vector<string> X509Cert::qcStatements() const
if(pos == -1)
return result;
X509_EXTENSION *ext = X509_get_ext(cert.get(), pos);
SCOPE(QCStatements, qc, ASN1_item_unpack(X509_EXTENSION_get_data(ext), ASN1_ITEM_rptr(QCStatements)));
auto qc = make_unique_cast<QCStatements_free>(ASN1_item_unpack(X509_EXTENSION_get_data(ext), ASN1_ITEM_rptr(QCStatements)));
if(!qc)
return result;

Expand All @@ -380,33 +377,31 @@ vector<string> X509Cert::qcStatements() const
#ifndef TEMPLATE
if(!s->statementInfo)
continue;
SCOPE(SemanticsInformation, si, ASN1_item_unpack(s->statementInfo->value.sequence, ASN1_ITEM_rptr(SemanticsInformation)));
auto si = make_unique_cast<SemanticsInformation_free>(ASN1_item_unpack(s->statementInfo->value.sequence, ASN1_ITEM_rptr(SemanticsInformation)));
if(!si)
continue;
oid = toOID(si->semanticsIdentifier);
result.push_back(toOID(si->semanticsIdentifier));
#else
oid = toOID(s->statementInfo.semanticsInformation->semanticsIdentifier);
result.push_back(toOID(s->statementInfo.semanticsInformation->semanticsIdentifier));
#endif
result.push_back(oid);
}
else if(oid == QC_QCT)
{
#ifndef TEMPLATE
if(!s->statementInfo)
continue;
SCOPE(QcType, qct, ASN1_item_unpack(s->statementInfo->value.sequence, ASN1_ITEM_rptr(QcType)));
auto qct = make_unique_cast<QcType_free>(ASN1_item_unpack(s->statementInfo->value.sequence, ASN1_ITEM_rptr(QcType)));
if(!qct)
continue;
for(int j = 0; j < sk_ASN1_OBJECT_num(qct.get()); ++j)
{
oid = toOID(sk_ASN1_OBJECT_value(qct.get(), j));
result.push_back(toOID(sk_ASN1_OBJECT_value(qct.get(), j)));
#else
#endif
result.push_back(oid);
}
}
else
result.push_back(oid);
result.push_back(std::move(oid));
}
return result;
}
Expand Down Expand Up @@ -463,7 +458,7 @@ string X509Cert::toString(const string &obj) const
}
else
{
SCOPE(BIO, mem, BIO_new(BIO_s_mem()));
auto mem = make_unique_ptr<BIO_free>(BIO_new(BIO_s_mem()));
if(!mem)
THROW_OPENSSLEXCEPTION("Failed to allocate memory for X509_NAME conversion");

Expand Down Expand Up @@ -494,7 +489,7 @@ bool X509Cert::isCA() const
{
if(!cert)
return false;
SCOPE(BASIC_CONSTRAINTS, cons, X509_get_ext_d2i(cert.get(), NID_basic_constraints, nullptr, nullptr));
auto cons = make_unique_cast<BASIC_CONSTRAINTS_free>(X509_get_ext_d2i(cert.get(), NID_basic_constraints, nullptr, nullptr));
return cons && cons->ca > 0;
}

Expand Down
37 changes: 29 additions & 8 deletions src/util/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,22 @@ struct free_deleter
template<class T>
void operator()(T *p) const noexcept
{
if (p) D(p);
D(p);
}
};

template<typename> struct free_argument;
template<class T, class R>
struct free_argument<R (*)(T *)>
{
using type = T;
};
template<class T, class R>
struct free_argument<R (&)(T *)>
{
using type = T;
};

template <class T>
using unique_free_t = std::unique_ptr<T, void(*)(T*)>;

Expand All @@ -44,13 +56,6 @@ constexpr unique_free_t<T> make_unique_ptr(U *p, void (*d)(T*)) noexcept
return {static_cast<T*>(p), d};
}

template<class T>
[[nodiscard]]
constexpr unique_free_t<T> make_unique_ptr(nullptr_t, void (*d)(T*)) noexcept
{
return {nullptr, d};
}

template<class T, typename D>
[[nodiscard]]
constexpr std::unique_ptr<T, D> make_unique_ptr(T *p, D d) noexcept
Expand All @@ -65,4 +70,20 @@ constexpr auto make_unique_ptr(T *p) noexcept
return std::unique_ptr<T, free_deleter<D>>(p);
}

template<auto D>
[[nodiscard]]
constexpr auto make_unique_ptr(nullptr_t) noexcept
{
using T = typename free_argument<decltype(D)>::type;
return make_unique_ptr<D, T>(nullptr);
}

template<auto D>
[[nodiscard]]
constexpr auto make_unique_cast(void *p) noexcept
{
using T = typename free_argument<decltype(D)>::type;
return make_unique_ptr<D>(static_cast<T*>(p));
}

}