Support multiple service certificates (#808)

IB-6585 Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Mar 9, 2021 · e3b5162 · e3b5162
1 parent 30ac8f1
commit e3b5162
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ include( GNUInstallDirs )
 include( VersionInfo )
 
 find_package( PKCS11 )
-find_package( LibDigiDocpp 3.14.4 REQUIRED )
+find_package( LibDigiDocpp 3.14.5 REQUIRED )
 find_package( LDAP REQUIRED )
 find_package( Qt5 5.9.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools )
 

diff --git a/client/Application.cpp b/client/Application.cpp
@@ -193,14 +193,25 @@ class DigidocConf: public digidoc::XmlConfCurrent
 		QByteArray cert = QByteArray::fromBase64(obj.value(QStringLiteral("SIVA-CERT")).toString().toLatin1());
 		return digidoc::X509Cert((const unsigned char*)cert.constData(), size_t(cert.size()));
 	}
+	std::vector<digidoc::X509Cert> verifyServiceCerts() const override
+	{
+		std::vector<digidoc::X509Cert> list;
+		list.push_back(verifyServiceCert());
+		for(const QJsonValue &cert: obj.value(QStringLiteral("CERT-BUNDLE")).toArray())
+		{
+			QByteArray der = QByteArray::fromBase64(cert.toString().toLatin1());
+			list.emplace_back((const unsigned char*)der.constData(), size_t(der.size()));
+		}
+		return list;
+	}
 	std::string verifyServiceUri() const override { return valueSystemScope(QStringLiteral("SIVA-URL"), digidoc::XmlConfCurrent::verifyServiceUri()); }
 	std::vector<digidoc::X509Cert> TSLCerts() const override
 	{
 		std::vector<digidoc::X509Cert> tslcerts;
 		for(const QJsonValue &val: obj.value(QStringLiteral("TSL-CERTS")).toArray())
 		{
 			QByteArray cert = QByteArray::fromBase64(val.toString().toLatin1());
-			tslcerts.emplace_back(digidoc::X509Cert((const unsigned char*)cert.constData(), size_t(cert.size())));
+			tslcerts.emplace_back((const unsigned char*)cert.constData(), size_t(cert.size()));
 		}
 		return tslcerts.empty() ? digidoc::XmlConfCurrent::TSLCerts() : tslcerts;
 	}