Merge pull request #2943

ef5d855 openpgp: implement public subkeys support (xiphon)

2 files changed, 6 insertions, 3 deletions

diff --git a/src/qt/updater.cpp b/src/qt/updater.cpp
index b8afc761..63078640 100644
--- a/src/qt/updater.cpp
+++ b/src/qt/updater.cpp
@@ -158,9 +158,12 @@ QString Updater::verifySignature(const epee::span<const uint8_t> data, const ope
 {
     for (const auto &maintainer : m_maintainers)
     {
-        if (signature.verify(data, maintainer))
+        for (const auto &public_key : maintainer)
         {
-            return QString::fromStdString(maintainer.user_id());
+            if (signature.verify(data, public_key))
+            {
+                return QString::fromStdString(maintainer.user_id());
+            }
         }
     }
 
diff --git a/src/qt/updater.h b/src/qt/updater.h
index 48a59a71..e787e42d 100644
--- a/src/qt/updater.h
+++ b/src/qt/updater.h
@@ -60,5 +60,5 @@ private:
     QByteArray parseShasumOutput(const QString &message, const QString &filename) const;
 
 private:
-    std::vector<openpgp::public_key_rsa> m_maintainers;
+    std::vector<openpgp::public_key_block> m_maintainers;
 };