aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/function/gpg/GpgKeyManager.cpp1
-rw-r--r--src/test/core/GpgCoreTestBasicOpera.cpp10
-rw-r--r--src/test/core/GpgCoreTestFileBasicOpera.cpp13
-rw-r--r--src/test/core/GpgCoreTestSubkeygen.cpp6
-rw-r--r--src/ui/dialog/import_export/ExportKeyPackageDialog.cpp4
-rw-r--r--src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp4
-rw-r--r--src/ui/main_window/MainWindowFileSlotFunction.cpp21
-rw-r--r--src/ui/main_window/MainWindowGpgOperaFunction.cpp4
8 files changed, 61 insertions, 2 deletions
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index 2d201289..18a8751e 100644
--- a/src/core/function/gpg/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -65,6 +65,7 @@ auto GpgFrontend::GpgKeyManager::RevSign(
for (const auto& sign_id : *signature_id) {
auto signing_key = key_getter.GetKey(sign_id.first);
assert(signing_key.IsGood());
+
auto err = CheckGpgError(
gpgme_op_revsig(ctx_.DefaultContext(), gpgme_key_t(key),
gpgme_key_t(signing_key), sign_id.second.toUtf8(), 0));
diff --git a/src/test/core/GpgCoreTestBasicOpera.cpp b/src/test/core/GpgCoreTestBasicOpera.cpp
index 1c35a414..2e675766 100644
--- a/src/test/core/GpgCoreTestBasicOpera.cpp
+++ b/src/test/core/GpgCoreTestBasicOpera.cpp
@@ -42,6 +42,8 @@ namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, CoreEncryptDecrTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(encrypt_key.IsGood());
+
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto [err, data_object] =
@@ -152,6 +154,8 @@ TEST_F(GpgCoreTest, CoreEncryptDecrTest_KeyNotFound_ResultAnalyse) {
TEST_F(GpgCoreTest, CoreSignVerifyNormalTest) {
auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
auto [err, data_object] = GpgBasicOperator::GetInstance().SignSync(
@@ -177,6 +181,8 @@ TEST_F(GpgCoreTest, CoreSignVerifyNormalTest) {
TEST_F(GpgCoreTest, CoreSignVerifyDetachTest) {
auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
auto [err, data_object] = GpgBasicOperator::GetInstance().SignSync(
@@ -202,6 +208,8 @@ TEST_F(GpgCoreTest, CoreSignVerifyDetachTest) {
TEST_F(GpgCoreTest, CoreSignVerifyClearTest) {
auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
auto [err, data_object] = GpgBasicOperator::GetInstance().SignSync(
@@ -226,8 +234,10 @@ TEST_F(GpgCoreTest, CoreSignVerifyClearTest) {
TEST_F(GpgCoreTest, CoreEncryptSignDecrVerifyTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(encrypt_key.IsGood());
auto sign_key = GpgKeyGetter::GetInstance().GetKey(
"8933EB283A18995F45D61DAC021D89771B680FFB");
+ ASSERT_TRUE(sign_key.IsGood());
auto encrypt_text = GFBuffer(QString("Hello GpgFrontend!"));
ASSERT_TRUE(sign_key.IsPrivateKey());
diff --git a/src/test/core/GpgCoreTestFileBasicOpera.cpp b/src/test/core/GpgCoreTestFileBasicOpera.cpp
index ce7359b2..9a0c6a34 100644
--- a/src/test/core/GpgCoreTestFileBasicOpera.cpp
+++ b/src/test/core/GpgCoreTestFileBasicOpera.cpp
@@ -42,6 +42,7 @@ namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, CoreFileEncryptDecrTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(encrypt_key.IsGood());
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
@@ -73,6 +74,7 @@ TEST_F(GpgCoreTest, CoreFileEncryptDecrTest) {
TEST_F(GpgCoreTest, CoreFileEncryptDecrBinaryTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(encrypt_key.IsGood());
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
@@ -165,6 +167,8 @@ TEST_F(GpgCoreTest, CoreFileEncryptSymmetricDecrBinaryTest) {
TEST_F(GpgCoreTest, CoreFileSignVerifyNormalTest) {
auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto input_file = CreateTempFileAndWriteData("Hello GpgFrontend!");
auto output_file = GetTempFilePath();
@@ -190,6 +194,8 @@ TEST_F(GpgCoreTest, CoreFileSignVerifyNormalTest) {
TEST_F(GpgCoreTest, CoreFileSignVerifyNormalBinaryTest) {
auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto input_file = CreateTempFileAndWriteData("Hello GpgFrontend!");
auto output_file = GetTempFilePath();
@@ -215,8 +221,12 @@ TEST_F(GpgCoreTest, CoreFileSignVerifyNormalBinaryTest) {
TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(encrypt_key.IsGood());
+
auto sign_key = GpgKeyGetter::GetInstance().GetKey(
"8933EB283A18995F45D61DAC021D89771B680FFB");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
auto output_file = GetTempFilePath();
@@ -259,8 +269,11 @@ TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyTest) {
TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyBinaryTest) {
auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
+ ASSERT_TRUE(encrypt_key.IsGood());
auto sign_key = GpgKeyGetter::GetInstance().GetKey(
"8933EB283A18995F45D61DAC021D89771B680FFB");
+ ASSERT_TRUE(sign_key.IsGood());
+
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
auto output_file = GetTempFilePath();
diff --git a/src/test/core/GpgCoreTestSubkeygen.cpp b/src/test/core/GpgCoreTestSubkeygen.cpp
index 34dcb85e..7c826c24 100644
--- a/src/test/core/GpgCoreTestSubkeygen.cpp
+++ b/src/test/core/GpgCoreTestSubkeygen.cpp
@@ -40,6 +40,7 @@ namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
@@ -83,6 +84,7 @@ TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) {
TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
@@ -126,6 +128,7 @@ TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) {
TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
@@ -169,6 +172,7 @@ TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) {
TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
@@ -212,6 +216,7 @@ TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) {
TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
@@ -255,6 +260,7 @@ TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) {
TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) {
auto main_key = GpgKeyGetter::GetInstance().GetKey(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
+ ASSERT_TRUE(main_key.IsGood());
auto subkeygen_info = SecureCreateSharedObject<GenKeyInfo>(true);
subkeygen_info->SetAlgo(
diff --git a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
index ec8582a4..c1923190 100644
--- a/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
+++ b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
@@ -98,6 +98,10 @@ GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog(
// get suitable key ids
auto keys = GpgKeyGetter::GetInstance(current_gpg_context_channel_)
.GetKeys(key_ids_);
+ for (const auto& key : *keys) {
+ assert(key.IsGood());
+ }
+
auto keys_new_end =
std::remove_if(keys->begin(), keys->end(), [this](const auto& key) {
return ui_->noPublicKeyCheckBox->isChecked() && !key.IsPrivateKey();
diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp
index 7bb0167d..94194652 100644
--- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp
@@ -108,12 +108,12 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) {
auto key_ids = m_key_list_->GetChecked();
auto keys =
GpgKeyGetter::GetInstance(current_gpg_context_channel_).GetKeys(key_ids);
- auto expires = std::make_unique<QDateTime>(expires_edit_->dateTime());
-
for (const auto& key : *keys) {
assert(key.IsGood());
}
+ auto expires = std::make_unique<QDateTime>(expires_edit_->dateTime());
+
for (const auto& uid : *m_uids_) {
// Sign For mKey
if (!GpgKeyManager::GetInstance().SignKey(m_key_, *keys, uid, expires)) {
diff --git a/src/ui/main_window/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp
index bad59303..4b1eec9f 100644
--- a/src/ui/main_window/MainWindowFileSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp
@@ -121,6 +121,9 @@ void MainWindow::SlotFileEncrypt(const QString& path) {
auto p_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
+ for (const auto& key : *p_keys) {
+ assert(key.IsGood());
+ }
// check key abilities
for (const auto& key : *p_keys) {
@@ -244,6 +247,9 @@ void MainWindow::SlotDirectoryEncrypt(const QString& path) {
auto p_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
+ for (const auto& key : *p_keys) {
+ assert(key.IsGood());
+ }
// check key abilities
for (const auto& key : *p_keys) {
@@ -408,6 +414,9 @@ void MainWindow::SlotFileSign(const QString& path) {
auto keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
+ for (const auto& key : *keys) {
+ assert(key.IsGood());
+ }
if (keys->empty()) {
QMessageBox::critical(
@@ -572,6 +581,9 @@ void MainWindow::SlotFileEncryptSign(const QString& path) {
auto p_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
+ for (const auto& key : *p_keys) {
+ assert(key.IsGood());
+ }
if (p_keys->empty()) {
QMessageBox::critical(
@@ -631,6 +643,9 @@ void MainWindow::SlotFileEncryptSign(const QString& path) {
auto p_signer_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(signer_key_ids);
+ for (const auto& key : *p_signer_keys) {
+ assert(key.IsGood());
+ }
CommonUtils::WaitForOpera(
this, tr("Encrypting and Signing"), [=](const OperaWaitingHd& op_hd) {
@@ -686,6 +701,9 @@ void MainWindow::SlotDirectoryEncryptSign(const QString& path) {
auto p_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
+ for (const auto& key : *p_keys) {
+ assert(key.IsGood());
+ }
if (p_keys->empty()) {
QMessageBox::critical(
@@ -745,6 +763,9 @@ void MainWindow::SlotDirectoryEncryptSign(const QString& path) {
auto p_signer_keys =
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(signer_key_ids);
+ for (const auto& key : *p_signer_keys) {
+ assert(key.IsGood());
+ }
CommonUtils::WaitForOpera(
this, tr("Archiving & Encrypting & Signing"),
diff --git a/src/ui/main_window/MainWindowGpgOperaFunction.cpp b/src/ui/main_window/MainWindowGpgOperaFunction.cpp
index 824fdd23..5069f600 100644
--- a/src/ui/main_window/MainWindowGpgOperaFunction.cpp
+++ b/src/ui/main_window/MainWindowGpgOperaFunction.cpp
@@ -102,6 +102,10 @@ void MainWindow::SlotEncrypt() {
GpgKeyGetter::GetInstance(m_key_list_->GetCurrentGpgContextChannel())
.GetKeys(key_ids);
for (const auto& key : *keys) {
+ assert(key.IsGood());
+ }
+
+ for (const auto& key : *keys) {
if (!key.IsHasActualEncryptionCapability()) {
QMessageBox::information(
this, tr("Invalid Operation"),
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 19:07:27 +0000