From 95171657e2a46cfbb824a9729c658c694511c99d Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Mon, 25 Jul 2022 13:30:57 +0300 Subject: [PATCH] Remove Test signature leftovers (#1079) IB-7425 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 4 +++- client/DigiDoc.h | 1 - client/PrintSheet.cpp | 1 - client/dialogs/SignatureDialog.cpp | 10 ---------- client/translations/en.ts | 16 ---------------- client/translations/et.ts | 16 ---------------- client/translations/ru.ts | 16 ---------------- client/widgets/SignatureItem.cpp | 3 --- 8 files changed, 3 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d390eec85..0975c97be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,7 +115,9 @@ jobs: path: libdigidocpp-pkg repo: open-eid/libdigidocpp - name: Install artifact - run: dnf install -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.rpm + run: | + . /etc/os-release + dnf install -y ./libdigidocpp-pkg/*fc${VERSION_ID}*.rpm - name: Build run: | cmake -DCMAKE_INSTALL_PREFIX=/usr -B build -S . diff --git a/client/DigiDoc.h b/client/DigiDoc.h index b2f73fccc..5cf228bba 100644 --- a/client/DigiDoc.h +++ b/client/DigiDoc.h @@ -38,7 +38,6 @@ class DigiDocSignature Valid, Warning, NonQSCD, - Test, Invalid, Unknown }; diff --git a/client/PrintSheet.cpp b/client/PrintSheet.cpp index 9005373c9..0defdac8a 100644 --- a/client/PrintSheet.cpp +++ b/client/PrintSheet.cpp @@ -140,7 +140,6 @@ PrintSheet::PrintSheet( DigiDoc *doc, QPrinter *printer ) case DigiDocSignature::Valid: valid = tr("SIGNATURE IS VALID"); break; case DigiDocSignature::Warning:valid = QStringLiteral("%1 (%2)").arg(tr("SIGNATURE IS VALID"), tr("NB! WARNINGS")); break; case DigiDocSignature::NonQSCD:valid = QStringLiteral("%1 (%2)").arg(tr("SIGNATURE IS VALID"), tr("NB! RESTRICTIONS")); break; - case DigiDocSignature::Test: valid = QStringLiteral("%1 (%2)").arg(tr("SIGNATURE IS VALID"), tr("NB! TEST SIGNATURE")); break; case DigiDocSignature::Invalid: valid = tr("SIGNATURE IS NOT VALID") ; break; case DigiDocSignature::Unknown: valid = tr("UNKNOWN"); break; } diff --git a/client/dialogs/SignatureDialog.cpp b/client/dialogs/SignatureDialog.cpp index 8a929e669..24adef2b0 100644 --- a/client/dialogs/SignatureDialog.cpp +++ b/client/dialogs/SignatureDialog.cpp @@ -81,16 +81,6 @@ SignatureDialog::SignatureDialog(const DigiDocSignature &signature, QWidget *par "This e-Signature is not equivalent with handwritten signature and therefore " "can be used only in transactions where Qualified e-Signature is not required.") ); break; - case DigiDocSignature::Test: - status += QStringLiteral("%1 (%2)").arg(isValid(isTS), tr("Test signature")); - if( !s.lastError().isEmpty() ) - d->error->setPlainText( s.lastError() ); - d->info->setText( tr( - "Test signature is signed with test certificates that are similar to the " - "certificates of real tokens, but digital signatures with legal force cannot " - "be given with them as there is no actual owner of the card. " - "Additional information.") ); - break; case DigiDocSignature::Invalid: style = QStringLiteral(""); status += isTS ? tr("is not valid", "Timestamp") : tr("is not valid", "Signature"); diff --git a/client/translations/en.ts b/client/translations/en.ts index a093a1c5a..b79ac7f10 100644 --- a/client/translations/en.ts +++ b/client/translations/en.ts @@ -2256,10 +2256,6 @@ and enter Smart-ID PIN2-code. AUTHORITY KEY IDENTIFIER AUTHORITY KEY IDENTIFIER - - NB! TEST SIGNATURE - NB! TEST SIGNATURE - NB! WARNINGS NB! WARNINGS @@ -2820,18 +2816,10 @@ Additional licenses and components This e-Signature is not equivalent with handwritten signature and therefore can be used only in transactions where Qualified e-Signature is not required. This e-Signature is not equivalent with handwritten signature and therefore can be used only in transactions where Qualified e-Signature is not required. - - Test signature - Test signature - Unknown error Unknown error - - Test signature is signed with test certificates that are similar to the certificates of real tokens, but digital signatures with legal force cannot be given with them as there is no actual owner of the card. <a href='https://www.id.ee/en/article/verifying-signatures-given-with-test-certificates-in-the-digidoc4-client/'>Additional information</a>. - Test signature is signed with test certificates that are similar to the certificates of real tokens, but digital signatures with legal force cannot be given with them as there is no actual owner of the card. <a href='https://www.id.ee/en/article/verifying-signatures-given-with-test-certificates-in-the-digidoc4-client/'>Additional information</a>. - This is an invalid signature or malformed digitally signed file. The signature is not valid. This is an invalid signature or malformed digitally signed file. The signature is not valid. @@ -2998,10 +2986,6 @@ Additional licenses and components Restrictions Restrictions - - Test signature - Test signature - Signed on Signed on diff --git a/client/translations/et.ts b/client/translations/et.ts index 65d06ebb5..25a674e6b 100644 --- a/client/translations/et.ts +++ b/client/translations/et.ts @@ -2256,10 +2256,6 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood. AUTHORITY KEY IDENTIFIER VÄLJAANDJA VÕTME IDENTIFIKAATOR - - NB! TEST SIGNATURE - NB! TESTALLKIRI - NB! WARNINGS NB! HOIATUSEGA @@ -2820,18 +2816,10 @@ Täiendavad litsentsid ja komponendid This e-Signature is not equivalent with handwritten signature and therefore can be used only in transactions where Qualified e-Signature is not required. See e-allkiri ei ole käsitsi kirjutatud allkirjadega samaväärne ja seetõttu saab seda kasutada ainult tehingute puhul, kus kvalifitseeritud e-allkiri pole kohustuslik. - - Test signature - Testallkiri - Unknown error Tundmatu viga - - Test signature is signed with test certificates that are similar to the certificates of real tokens, but digital signatures with legal force cannot be given with them as there is no actual owner of the card. <a href='https://www.id.ee/en/article/verifying-signatures-given-with-test-certificates-in-the-digidoc4-client/'>Additional information</a>. - Testallkiri on allkirjastatud testsertifikaadiga, mis sarnaneb päris sertifikaadiga, kuid sellega ei saa anda õigusjõuga digitaalallkirju, sest kaardi omanikku tegelikkuses ei eksisteeri. <a href='https://www.id.ee/artikkel/testsertifikaatidega-antud-allkirjade-kontrollimine-digidoc4-kliendis/'>Täiendav info</a>. - This is an invalid signature or malformed digitally signed file. The signature is not valid. See allkiri või allkirjastatud fail on vigane. Allkiri ei ole kehtiv. @@ -2998,10 +2986,6 @@ Täiendavad litsentsid ja komponendid Restrictions Piirangud - - Test signature - Testallkiri - Signed on Allkirjastatud diff --git a/client/translations/ru.ts b/client/translations/ru.ts index d41efb107..7b4d8c60f 100644 --- a/client/translations/ru.ts +++ b/client/translations/ru.ts @@ -2259,10 +2259,6 @@ and enter Smart-ID PIN2-code. AUTHORITY KEY IDENTIFIER ИДЕНТИФИКАТОР ЛИЧНОГО КЛЮЧА - - NB! TEST SIGNATURE - NB! ПРОБНАЯ ПОДПИСЬ - NB! WARNINGS NB! ПРЕДУПРЕЖДЕНИЯ @@ -2833,10 +2829,6 @@ Additional licenses and components This e-Signature is not equivalent with handwritten signature and therefore can be used only in transactions where Qualified e-Signature is not required. Эта электронная подпись не эквивалентна рукописной подписи и поэтому может использоваться только в тех случаях, когда не требуется квалифицированная электронная подпись. - - Test signature - Пробная подпись - is unknown Signature @@ -2861,10 +2853,6 @@ Additional licenses and components Timestamp недействителен - - Test signature is signed with test certificates that are similar to the certificates of real tokens, but digital signatures with legal force cannot be given with them as there is no actual owner of the card. <a href='https://www.id.ee/en/article/verifying-signatures-given-with-test-certificates-in-the-digidoc4-client/'>Additional information</a>. - Пробная подпись создается пробным сертификатом, который отличается от настоящего тем, что с пробным сертификатом нельзя поставить юридически действительную подись, потому что владелец карты на самом деле не существует. <a href='https://www.id.ee/en/article/verifying-signatures-given-with-test-certificates-in-the-digidoc4-client/'>Дополнительная информация</a>. - This is an invalid signature or malformed digitally signed file. The signature is not valid. Повреждена подпись или подписанный файл. Данная подпись недействительна. @@ -2977,10 +2965,6 @@ Additional licenses and components Restrictions Ограничения - - Test signature - Пробная подпись - Signature is valid Подпись действительна diff --git a/client/widgets/SignatureItem.cpp b/client/widgets/SignatureItem.cpp index b2b816fee..c1361863e 100644 --- a/client/widgets/SignatureItem.cpp +++ b/client/widgets/SignatureItem.cpp @@ -118,9 +118,6 @@ void SignatureItem::init() case DigiDocSignature::NonQSCD: s << color(QLatin1String("green"), isValid()) << " " << color(QLatin1String("#996C0B"), QStringLiteral("(%1)").arg(tr("Restrictions"))); break; - case DigiDocSignature::Test: - s << color(QLatin1String("green"), isValid()) << " (" << tr("Test signature") << ")"; - break; case DigiDocSignature::Invalid: ui->error = isSignature ? ria::qdigidoc4::InvalidSignatureWarning : ria::qdigidoc4::InvalidTimestampWarning; s << color(QLatin1String("red"), isSignature ? tr("Signature is not valid") : tr("Timestamp is not valid"));