Skip to content

Coverity fixes #1403

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

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Coverity fixes #1403

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
10 changes: 5 additions & 5 deletions client/CDocSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ getDecryptStatus(const std::vector<uint8_t>& result, QCryptoBackend::PinStatus p
libcdoc::result_t
DDCryptoBackend::decryptRSA(std::vector<uint8_t>& result, const std::vector<uint8_t> &data, bool oaep, unsigned int idx)
{
QCryptoBackend::PinStatus pin_status;
QCryptoBackend::PinStatus pin_status = QCryptoBackend::PinOK;
QByteArray qkek = qApp->signer()->decrypt([qdata = toByteArray(data), &oaep](QCryptoBackend *backend) {
return backend->decrypt(qdata, oaep);
}, pin_status);
Expand All @@ -124,7 +124,7 @@ libcdoc::result_t
DDCryptoBackend::deriveConcatKDF(std::vector<uint8_t>& dst, const std::vector<uint8_t> &publicKey, const std::string &digest,
const std::vector<uint8_t> &algorithmID, const std::vector<uint8_t> &partyUInfo, const std::vector<uint8_t> &partyVInfo, unsigned int idx)
{
QCryptoBackend::PinStatus pin_status;
QCryptoBackend::PinStatus pin_status = QCryptoBackend::PinOK;
QByteArray decryptedKey = qApp->signer()->decrypt([&publicKey, &digest, &algorithmID, &partyUInfo, &partyVInfo](QCryptoBackend *backend) {
static const QHash<std::string_view, QCryptographicHash::Algorithm> SHA_MTH{
{"http://www.w3.org/2001/04/xmlenc#sha256", QCryptographicHash::Sha256},
Expand All @@ -141,7 +141,7 @@ DDCryptoBackend::deriveConcatKDF(std::vector<uint8_t>& dst, const std::vector<ui
libcdoc::result_t
DDCryptoBackend::deriveHMACExtract(std::vector<uint8_t>& dst, const std::vector<uint8_t> &key_material, const std::vector<uint8_t> &salt, unsigned int idx)
{
QCryptoBackend::PinStatus pin_status;
QCryptoBackend::PinStatus pin_status = QCryptoBackend::PinOK;
QByteArray qkekpm = qApp->signer()->decrypt([qkey_material = toByteArray(key_material), qsalt = toByteArray(salt)](QCryptoBackend *backend) {
return backend->deriveHMACExtract(qkey_material, qsalt, ECC_KEY_LEN);
}, pin_status);
Expand Down Expand Up @@ -290,7 +290,7 @@ DDNetworkBackend::fetchKey(std::vector<uint8_t> &result,
last_error = "No connection";
return BACKEND_ERROR;
}
QCryptoBackend::PinStatus pin_status;
QCryptoBackend::PinStatus pin_status = QCryptoBackend::PinOK;
auto authKey = dispatchToMain([&] {
return qApp->signer()->key(pin_status);
});
Expand Down Expand Up @@ -412,7 +412,7 @@ TempListConsumer::open(const std::string& name, int64_t size)
std::string truncated = name;
if (truncated.starts_with("./PaxHeaders.X/"))
truncated = truncated.substr(15);
IOEntry io({truncated, "application/octet-stream", 0, {}});
IOEntry io({std::move(truncated), "application/octet-stream", 0, {}});
if ((size < 0) || (size > MAX_VEC_SIZE)) {
io.data = std::make_unique<QTemporaryFile>();
} else {
Expand Down
2 changes: 1 addition & 1 deletion client/libcdoc
Open in desktop
Submodule libcdoc updated 18 files
+4 −1 .github/workflows/build.yml
+11 −9 CMakeLists.txt
+2 −2 cdoc/CDoc.cpp
+1 −1 cdoc/CDoc2.h
+16 −20 cdoc/CDoc2Reader.cpp
+32 −33 cdoc/CDoc2Writer.cpp
+12 −46 cdoc/CDocCipher.cpp
+5 −1 cdoc/DDocWriter.cpp
+1 −0 cdoc/DDocWriter.h
+0 −3 cdoc/Lock.cpp
+1 −1 cdoc/PKCS11Backend.cpp
+64 −55 cdoc/Tar.cpp
+10 −10 cdoc/Tar.h
+2 −1 cdoc/Utils.cpp
+25 −3 cdoc/Utils.h
+1 −2 etc/Doxyfile.in
+9 −3 test/CMakeLists.txt
+71 −7 test/libcdoc_boost.cpp
Loading