No OneTemporary
Actions

Size

49 KB

Subscribers

None

View Options

	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index c1932db1e..511ef230c 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -1,642 +1,644 @@
	# SPDX-FileCopyrightText: none
	# SPDX-License-Identifier: BSD-3-Clause
	add_subdirectory(icons)
	add_subdirectory(mimetypes)

	include_directories(${CMAKE_CURRENT_BINARY_DIR})
	include_directories(${CMAKE_CURRENT_SOURCE_DIR})

	if (NOT DISABLE_KWATCHGNUPG)
	add_subdirectory(kwatchgnupg)
	endif()
	add_subdirectory(libkleopatraclient)
	add_subdirectory(conf)
	add_subdirectory(kconf_update)

	if(WIN32)
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
	set(_kleopatra_extra_SRCS
	selftest/registrycheck.cpp selftest/registrycheck.h
	utils/gnupg-registry.c
	utils/userinfo_win.cpp
	utils/windowsprocessdevice.cpp utils/windowsprocessdevice.h
	versioninfo.rc kleopatra.w32-manifest
	)
	else()
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp)
	set(_kleopatra_extra_SRCS)
	endif()

	set(_kleopatra_uiserver_SRCS
	${_kleopatra_extra_uiserver_SRCS}

	selftest/uiservercheck.cpp selftest/uiservercheck.h
	uiserver/assuanserverconnection.cpp uiserver/assuanserverconnection.h
	uiserver/createchecksumscommand.cpp uiserver/createchecksumscommand.h
	uiserver/decryptverifycommandemailbase.cpp uiserver/decryptverifycommandemailbase.h
	uiserver/decryptverifycommandfilesbase.cpp uiserver/decryptverifycommandfilesbase.h
	uiserver/echocommand.cpp uiserver/echocommand.h
	uiserver/encryptcommand.cpp uiserver/encryptcommand.h
	uiserver/importfilescommand.cpp uiserver/importfilescommand.h
	uiserver/prepencryptcommand.cpp uiserver/prepencryptcommand.h
	uiserver/prepsigncommand.cpp uiserver/prepsigncommand.h
	uiserver/selectcertificatecommand.cpp
	uiserver/sessiondata.cpp uiserver/sessiondata.h
	uiserver/signcommand.cpp uiserver/signcommand.h
	uiserver/signencryptfilescommand.cpp
	uiserver/uiserver.cpp
	uiserver/verifychecksumscommand.cpp uiserver/verifychecksumscommand.h
	)

	set(_kleopatra_uiserver_extra_libs LibAssuan::LibAssuan LibGpgError::LibGpgError)

	if(HAVE_GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	else()
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	endif()

	if(KPim${KF_MAJOR_VERSION}IdentityManagement_FOUND AND KPim${KF_MAJOR_VERSION}MailTransport_FOUND AND KPim${KF_MAJOR_VERSION}AkonadiMime_FOUND)
	set(_kleopatra_mail_libs
	KPim${KF_MAJOR_VERSION}::IdentityManagement # Export OpenPGP keys using WKS
	KPim${KF_MAJOR_VERSION}::MailTransport
	KPim${KF_MAJOR_VERSION}::AkonadiMime
	)
	add_definitions(-DMAILAKONADI_ENABLED)
	endif()

	ki18n_wrap_ui(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)

	set(_kleopatra_SRCS
	${_kleopatra_extra_SRCS}

	accessibility/accessiblelink.cpp
	accessibility/accessiblelink_p.h
	accessibility/accessiblerichtextlabel.cpp
	accessibility/accessiblerichtextlabel_p.h
	accessibility/accessiblevaluelabel.cpp
	accessibility/accessiblevaluelabel_p.h
	accessibility/accessiblewidgetfactory.cpp
	accessibility/accessiblewidgetfactory.h
	commands/addsubkeycommand.cpp
	commands/addsubkeycommand.h
	commands/adduseridcommand.cpp
	commands/adduseridcommand.h
	commands/authenticatepivcardapplicationcommand.cpp
	commands/authenticatepivcardapplicationcommand.h
	commands/cardcommand.cpp
	commands/cardcommand.h
	commands/certificatetopivcardcommand.cpp
	commands/certificatetopivcardcommand.h
	commands/certifycertificatecommand.cpp
	commands/certifycertificatecommand.h
	commands/certifygroupcommand.cpp
	commands/certifygroupcommand.h
	commands/changeexpirycommand.cpp
	commands/changeexpirycommand.h
	commands/changeownertrustcommand.cpp
	commands/changeownertrustcommand.h
	commands/changepassphrasecommand.cpp
	commands/changepassphrasecommand.h
	commands/changepincommand.cpp
	commands/changepincommand.h
	commands/changeroottrustcommand.cpp
	commands/changeroottrustcommand.h
	commands/checksumcreatefilescommand.cpp
	commands/checksumcreatefilescommand.h
	commands/checksumverifyfilescommand.cpp
	commands/checksumverifyfilescommand.h
	commands/clearcrlcachecommand.cpp
	commands/clearcrlcachecommand.h
	commands/command.cpp
	commands/command.h
	commands/createcsrforcardkeycommand.cpp
	commands/createcsrforcardkeycommand.h
	commands/creategroupcommand.cpp
	commands/creategroupcommand.h
	commands/createopenpgpkeyfromcardkeyscommand.cpp
	commands/createopenpgpkeyfromcardkeyscommand.h
	commands/decryptverifyclipboardcommand.cpp
	commands/decryptverifyclipboardcommand.h
	commands/decryptverifyfilescommand.cpp
	commands/decryptverifyfilescommand.h
	commands/deletecertificatescommand.cpp
	commands/deletecertificatescommand.h
	commands/detailscommand.cpp
	commands/detailscommand.h
	commands/dumpcertificatecommand.cpp
	commands/dumpcertificatecommand.h
	commands/dumpcrlcachecommand.cpp
	commands/dumpcrlcachecommand.h
	commands/encryptclipboardcommand.cpp
	commands/encryptclipboardcommand.h
	commands/exportcertificatecommand.cpp
	commands/exportcertificatecommand.h
	commands/exportgroupscommand.cpp
	commands/exportgroupscommand.h
	commands/exportopenpgpcertstoservercommand.cpp
	commands/exportopenpgpcertstoservercommand.h
	commands/exportopenpgpcerttoprovidercommand.cpp
	commands/exportopenpgpcerttoprovidercommand.h
	commands/exportpaperkeycommand.cpp
	commands/exportpaperkeycommand.h
	commands/exportsecretkeycommand.cpp
	commands/exportsecretkeycommand.h
	commands/exportsecretsubkeycommand.cpp
	commands/exportsecretsubkeycommand.h
	commands/genrevokecommand.cpp
	commands/genrevokecommand.h
	commands/gnupgprocesscommand.cpp
	commands/gnupgprocesscommand.h
	commands/importcertificatefromclipboardcommand.cpp
	commands/importcertificatefromclipboardcommand.h
	commands/importcertificatefromdatacommand.cpp
	commands/importcertificatefromdatacommand.h
	commands/importcertificatefromfilecommand.cpp
	commands/importcertificatefromfilecommand.h
	commands/importcertificatefromkeyservercommand.cpp
	commands/importcertificatefromkeyservercommand.h
	commands/importcertificatefrompivcardcommand.cpp
	commands/importcertificatefrompivcardcommand.h
	commands/importcertificatescommand.cpp
	commands/importcertificatescommand.h
	commands/importcrlcommand.cpp
	commands/importcrlcommand.h
	commands/importpaperkeycommand.cpp
	commands/importpaperkeycommand.h
	commands/keytocardcommand.cpp
	commands/keytocardcommand.h
	commands/lookupcertificatescommand.cpp
	commands/lookupcertificatescommand.h
	commands/newcertificatesigningrequestcommand.cpp
	commands/newcertificatesigningrequestcommand.h
	commands/newopenpgpcertificatecommand.cpp
	commands/newopenpgpcertificatecommand.h
	commands/openpgpgeneratecardkeycommand.cpp
	commands/openpgpgeneratecardkeycommand.h
	commands/pivgeneratecardkeycommand.cpp
	commands/pivgeneratecardkeycommand.h
	commands/refreshcertificatecommand.cpp
	commands/refreshcertificatecommand.h
	commands/refreshopenpgpcertscommand.cpp
	commands/refreshopenpgpcertscommand.h
	commands/refreshx509certscommand.cpp
	commands/refreshx509certscommand.h
	commands/reloadkeyscommand.cpp
	commands/reloadkeyscommand.h
	commands/revokecertificationcommand.cpp
	commands/revokecertificationcommand.h
	commands/revokekeycommand.cpp
	commands/revokekeycommand.h
	commands/revokeuseridcommand.cpp
	commands/revokeuseridcommand.h
	commands/selftestcommand.cpp
	commands/selftestcommand.h
	commands/setinitialpincommand.cpp
	commands/setinitialpincommand.h
	commands/setpivcardapplicationadministrationkeycommand.cpp
	commands/setpivcardapplicationadministrationkeycommand.h
	commands/setprimaryuseridcommand.cpp
	commands/setprimaryuseridcommand.h
	commands/signclipboardcommand.cpp
	commands/signclipboardcommand.h
	commands/signencryptfilescommand.cpp
	commands/signencryptfilescommand.h
	commands/signencryptfoldercommand.cpp
	commands/signencryptfoldercommand.h
	commands/viewemailfilescommand.cpp
	commands/viewemailfilescommand.h
	conf/configuredialog.cpp
	conf/configuredialog.h
	conf/groupsconfigdialog.cpp
	conf/groupsconfigdialog.h
	conf/groupsconfigwidget.cpp
	conf/groupsconfigwidget.h
	crypto/autodecryptverifyfilescontroller.cpp
	crypto/autodecryptverifyfilescontroller.h
	crypto/certificateresolver.cpp
	crypto/certificateresolver.h
	crypto/checksumsutils_p.cpp
	crypto/checksumsutils_p.h
	crypto/controller.cpp
	crypto/controller.h
	crypto/createchecksumscontroller.cpp
	crypto/createchecksumscontroller.h
	crypto/decryptverifyemailcontroller.cpp
	crypto/decryptverifyemailcontroller.h
	crypto/decryptverifyfilescontroller.cpp
	crypto/decryptverifyfilescontroller.h
	crypto/decryptverifytask.cpp
	crypto/decryptverifytask.h
	crypto/encryptemailcontroller.cpp
	crypto/encryptemailcontroller.h
	crypto/encryptemailtask.cpp
	crypto/encryptemailtask.h
	crypto/gui/certificatelineedit.cpp
	crypto/gui/certificatelineedit.h
	crypto/gui/certificateselectionline.cpp
	crypto/gui/certificateselectionline.h
	crypto/gui/decryptverifyfilesdialog.cpp
	crypto/gui/decryptverifyfilesdialog.h
	crypto/gui/decryptverifyfileswizard.cpp
	crypto/gui/decryptverifyfileswizard.h
	crypto/gui/decryptverifyoperationwidget.cpp
	crypto/gui/decryptverifyoperationwidget.h
	crypto/gui/encryptemailwizard.cpp
	crypto/gui/encryptemailwizard.h
	crypto/gui/newresultpage.cpp
	crypto/gui/newresultpage.h
	crypto/gui/objectspage.cpp
	crypto/gui/objectspage.h
	crypto/gui/resolverecipientspage.cpp
	crypto/gui/resolverecipientspage.h
	crypto/gui/resultitemwidget.cpp
	crypto/gui/resultitemwidget.h
	crypto/gui/resultlistwidget.cpp
	crypto/gui/resultlistwidget.h
	crypto/gui/resultpage.cpp
	crypto/gui/resultpage.h
	crypto/gui/signemailwizard.cpp
	crypto/gui/signemailwizard.h
	crypto/gui/signencryptemailconflictdialog.cpp
	crypto/gui/signencryptemailconflictdialog.h
	crypto/gui/signencryptfileswizard.cpp
	crypto/gui/signencryptfileswizard.h
	crypto/gui/signencryptwidget.cpp
	crypto/gui/signencryptwidget.h
	crypto/gui/signencryptwizard.cpp
	crypto/gui/signencryptwizard.h
	crypto/gui/signerresolvepage.cpp
	crypto/gui/signerresolvepage.h
	crypto/gui/signingcertificateselectiondialog.cpp
	crypto/gui/signingcertificateselectiondialog.h
	crypto/gui/signingcertificateselectionwidget.cpp
	crypto/gui/signingcertificateselectionwidget.h
	crypto/gui/unknownrecipientwidget.cpp
	crypto/gui/unknownrecipientwidget.h
	crypto/gui/verifychecksumsdialog.cpp
	crypto/gui/verifychecksumsdialog.h
	crypto/gui/wizard.cpp
	crypto/gui/wizard.h
	crypto/gui/wizardpage.cpp
	crypto/gui/wizardpage.h
	crypto/newsignencryptemailcontroller.cpp
	crypto/newsignencryptemailcontroller.h
	crypto/recipient.cpp
	crypto/recipient.h
	crypto/sender.cpp
	crypto/sender.h
	crypto/signemailcontroller.cpp
	crypto/signemailcontroller.h
	crypto/signemailtask.cpp
	crypto/signemailtask.h
	crypto/signencryptfilescontroller.cpp
	crypto/signencryptfilescontroller.h
	crypto/signencrypttask.cpp
	crypto/signencrypttask.h
	crypto/task.cpp
	crypto/task.h
	crypto/taskcollection.cpp
	crypto/taskcollection.h
	crypto/verifychecksumscontroller.cpp
	crypto/verifychecksumscontroller.h
	dialogs/addsubkeydialog.cpp
	dialogs/addsubkeydialog.h
	dialogs/adduseriddialog.cpp
	dialogs/adduseriddialog.h
	dialogs/animatedexpander.cpp
	dialogs/animatedexpander.h
	dialogs/cardinfotab.cpp
	dialogs/cardinfotab.h
	dialogs/certificatedetailsdialog.cpp
	dialogs/certificatedetailsdialog.h
	dialogs/certificatedetailsinputwidget.cpp
	dialogs/certificatedetailsinputwidget.h
	dialogs/certificatedetailswidget.cpp
	dialogs/certificatedetailswidget.h
	dialogs/certificatedumpwidget.cpp
	dialogs/certificatedumpwidget.h
	dialogs/certificateselectiondialog.cpp
	dialogs/certificateselectiondialog.h
	dialogs/certifycertificatedialog.cpp
	dialogs/certifycertificatedialog.h
	dialogs/certifywidget.cpp
	dialogs/certifywidget.h
	dialogs/createcsrforcardkeydialog.cpp
	dialogs/createcsrforcardkeydialog.h
	dialogs/deletecertificatesdialog.cpp
	dialogs/deletecertificatesdialog.h
	dialogs/editgroupdialog.cpp
	dialogs/editgroupdialog.h
	dialogs/expirydialog.cpp
	dialogs/expirydialog.h
	dialogs/exportdialog.cpp
	dialogs/exportdialog.h
	dialogs/gencardkeydialog.cpp
	dialogs/gencardkeydialog.h
	dialogs/groupdetailsdialog.cpp
	dialogs/groupdetailsdialog.h
	dialogs/lookupcertificatesdialog.cpp
	dialogs/lookupcertificatesdialog.h
	dialogs/nameandemailwidget.cpp
	dialogs/nameandemailwidget.h
	dialogs/newopenpgpcertificatedetailsdialog.cpp
	dialogs/newopenpgpcertificatedetailsdialog.h
	dialogs/pivcardapplicationadministrationkeyinputdialog.cpp
	dialogs/pivcardapplicationadministrationkeyinputdialog.h
	dialogs/revokekeydialog.cpp
	dialogs/revokekeydialog.h
	dialogs/selftestdialog.cpp
	dialogs/selftestdialog.h
	dialogs/setinitialpindialog.cpp
	dialogs/setinitialpindialog.h
	dialogs/subkeyswidget.cpp
	dialogs/subkeyswidget.h
	dialogs/trustchainwidget.cpp
	dialogs/trustchainwidget.h
	dialogs/updatenotification.cpp
	dialogs/updatenotification.h
	dialogs/useridswidget.cpp
	dialogs/useridswidget.h
	dialogs/weboftrustwidget.cpp
	dialogs/weboftrustwidget.h
	interfaces/anchorprovider.h
	interfaces/focusfirstchild.h
	newcertificatewizard/advancedsettingsdialog.cpp
	newcertificatewizard/advancedsettingsdialog_p.h
	newcertificatewizard/enterdetailspage.cpp
	newcertificatewizard/enterdetailspage_p.h
	newcertificatewizard/keyalgo.cpp
	newcertificatewizard/keyalgo_p.h
	newcertificatewizard/keycreationpage.cpp
	newcertificatewizard/keycreationpage_p.h
	newcertificatewizard/listwidget.cpp
	newcertificatewizard/listwidget.h
	newcertificatewizard/newcertificatewizard.cpp
	newcertificatewizard/newcertificatewizard.h
	newcertificatewizard/resultpage.cpp
	newcertificatewizard/resultpage_p.h
	newcertificatewizard/wizardpage.cpp
	newcertificatewizard/wizardpage_p.h
	selftest/compliancecheck.cpp
	selftest/compliancecheck.h
	selftest/enginecheck.cpp
	selftest/enginecheck.h
	selftest/gpgagentcheck.cpp
	selftest/gpgagentcheck.h
	selftest/gpgconfcheck.cpp
	selftest/gpgconfcheck.h
	selftest/libkleopatrarccheck.cpp
	selftest/libkleopatrarccheck.h
	selftest/selftest.cpp
	selftest/selftest.h
	smartcard/algorithminfo.h
	smartcard/card.cpp
	smartcard/card.h
	smartcard/deviceinfowatcher.cpp
	smartcard/deviceinfowatcher.h
	smartcard/keypairinfo.cpp
	smartcard/keypairinfo.h
	smartcard/netkeycard.cpp
	smartcard/netkeycard.h
	smartcard/openpgpcard.cpp
	smartcard/openpgpcard.h
	smartcard/p15card.cpp
	smartcard/p15card.h
	smartcard/pivcard.cpp
	smartcard/pivcard.h
	smartcard/readerstatus.cpp
	smartcard/readerstatus.h
	smartcard/utils.cpp
	smartcard/utils.h
	utils/accessibility.cpp
	utils/accessibility.h
	utils/action_data.cpp
	utils/action_data.h
	utils/applicationstate.cpp
	utils/applicationstate.h
	utils/archivedefinition.cpp
	utils/archivedefinition.h
	utils/certificatepair.h
	utils/clipboardmenu.cpp
	utils/clipboardmenu.h
	utils/debug-helpers.cpp
	utils/debug-helpers.h
	utils/dragqueen.cpp
	utils/dragqueen.h
	utils/email.cpp
	utils/email.h
	utils/emptypassphraseprovider.cpp
	utils/emptypassphraseprovider.h
	utils/expiration.cpp
	utils/expiration.h
	utils/filedialog.cpp
	utils/filedialog.h
	utils/gui-helper.cpp
	utils/gui-helper.h
	utils/headerview.cpp
	utils/headerview.h
	utils/input.cpp
	utils/input.h
	utils/iodevicelogger.cpp
	utils/iodevicelogger.h
	utils/kdpipeiodevice.cpp
	utils/kdpipeiodevice.h
	utils/keyexportdraghandler.cpp
	utils/keyexportdraghandler.h
	utils/keyparameters.cpp
	utils/keyparameters.h
	utils/kuniqueservice.cpp
	utils/kuniqueservice.h
	utils/log.cpp
	utils/log.h
	utils/memory-helpers.h
	utils/migration.cpp
	utils/migration.h
	utils/multivalidator.cpp
	utils/multivalidator.h
	utils/output.cpp
	utils/output.h
	utils/overwritedialog.cpp
	utils/overwritedialog.h
	utils/path-helper.cpp
	utils/path-helper.h
	utils/scrollarea.cpp
	utils/scrollarea.h
	utils/systemtrayicon.cpp
	utils/systemtrayicon.h
	utils/tags.cpp
	utils/tags.h
	utils/types.cpp
	utils/types.h
	utils/userinfo.cpp
	utils/userinfo.h
	utils/validation.cpp
	utils/validation.h
	utils/writecertassuantransaction.cpp
	utils/writecertassuantransaction.h
	utils/wsastarter.cpp
	utils/wsastarter.h
	view/anchorcache.cpp
	view/anchorcache_p.h
	+ view/cardkeysview.cpp
	+ view/cardkeysview.h
	view/errorlabel.cpp
	view/errorlabel.h
	view/formtextinput.cpp
	view/formtextinput.h
	view/htmllabel.cpp
	view/htmllabel.h
	view/infofield.cpp
	view/infofield.h
	view/keycacheoverlay.cpp
	view/keycacheoverlay.h
	view/keylistcontroller.cpp
	view/keylistcontroller.h
	view/keytreeview.cpp
	view/keytreeview.h
	view/netkeywidget.cpp
	view/netkeywidget.h
	view/nullpinwidget.cpp
	view/nullpinwidget.h
	view/openpgpkeycardwidget.cpp
	view/openpgpkeycardwidget.h
	view/overlaywidget.cpp
	view/overlaywidget.h
	view/p15cardwidget.cpp
	view/p15cardwidget.h
	view/padwidget.cpp
	view/padwidget.h
	view/pgpcardwidget.cpp
	view/pgpcardwidget.h
	view/pivcardwidget.cpp
	view/pivcardwidget.h
	view/progressoverlay.cpp
	view/progressoverlay.h
	view/searchbar.cpp
	view/searchbar.h
	view/smartcardwidget.cpp
	view/smartcardwidget.h
	view/tabwidget.cpp
	view/tabwidget.h
	view/textoverlay.cpp
	view/textoverlay.h
	view/urllabel.cpp
	view/urllabel.h
	view/waitwidget.cpp
	view/waitwidget.h
	view/welcomewidget.cpp
	view/welcomewidget.h

	aboutdata.cpp
	aboutdata.h
	kleopatra.qrc
	kleopatraapplication.cpp
	kleopatraapplication.h
	main.cpp
	mainwindow.cpp
	mainwindow.h
	systrayicon.cpp
	systrayicon.h
	)

	if(WIN32)
	configure_file (versioninfo.rc.in versioninfo.rc)
	set(_kleopatra_SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc ${_kleopatra_SRCS})
	configure_file (kleopatra.w32-manifest.in kleopatra.w32-manifest)
	set(_kleopatra_SRCS ${CMAKE_CURRENT_BINARY_DIR}/kleopatra.w32-manifest ${_kleopatra_SRCS})
	endif()

	set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp conf/kleopageconfigdialog.h ${_kleopatra_SRCS})

	ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra
	DESCRIPTION "kleopatra (kleopatra)"
	OLD_CATEGORY_NAMES log_kleopatra
	EXPORT KLEOPATRA
	)


	if(KLEO_MODEL_TEST)
	add_definitions(-DKLEO_MODEL_TEST)
	set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp)
	endif()

	ki18n_wrap_ui(_kleopatra_SRCS
	dialogs/setinitialpindialog.ui
	dialogs/trustchainwidget.ui
	newcertificatewizard/listwidget.ui
	)

	kconfig_add_kcfg_files(_kleopatra_SRCS
	kcfg/emailoperationspreferences.kcfgc
	kcfg/fileoperationspreferences.kcfgc
	kcfg/settings.kcfgc
	kcfg/smimevalidationpreferences.kcfgc
	kcfg/tagspreferences.kcfgc
	kcfg/tooltippreferences.kcfgc
	)

	file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
	ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})

	add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_uiserver_SRCS})

	# For the ConfigureDialog & KCMs
	target_link_libraries(kleopatra_bin kcm_kleopatra_static)

	#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	# set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
	#endif()
	set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)

	if (WIN32)
	set(_kleopatra_platform_libs "secur32")
	endif ()

	target_link_libraries(kleopatra_bin
	Gpgmepp
	KPim${KF_MAJOR_VERSION}::Libkleo
	KPim${KF_MAJOR_VERSION}::Mime
	KPim${KF_MAJOR_VERSION}::MimeTreeParserWidgets
	KF${KF_MAJOR_VERSION}::Codecs
	KF${KF_MAJOR_VERSION}::CoreAddons
	KF${KF_MAJOR_VERSION}::Crash
	KF${KF_MAJOR_VERSION}::I18n
	KF${KF_MAJOR_VERSION}::IconThemes
	KF${KF_MAJOR_VERSION}::ItemModels
	KF${KF_MAJOR_VERSION}::KIOCore
	KF${KF_MAJOR_VERSION}::KIOWidgets
	KF${KF_MAJOR_VERSION}::WindowSystem
	KF${KF_MAJOR_VERSION}::XmlGui
	Qt::Network
	Qt::PrintSupport # Printing secret keys
	kleopatraclientcore
	${_kleopatra_extra_libs}
	${_kleopatra_mail_libs}
	${_kleopatra_uiserver_extra_libs}
	${_kleopatra_dbusaddons_libs}
	${_kleopatra_platform_libs}
	)

	if (QT_MAJOR_VERSION STREQUAL "6")
	target_link_libraries(kleopatra_bin Qt6::Core5Compat)
	target_link_libraries(kleopatra_bin QGpgmeQt6)
	else()
	target_link_libraries(kleopatra_bin QGpgme)
	endif()

	install(TARGETS kleopatra_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

	install(
	PROGRAMS data/org.kde.kleopatra.desktop data/kleopatra_import.desktop
	DESTINATION ${KDE_INSTALL_APPDIR}
	)
	install(FILES data/org.kde.kleopatra.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
	install(FILES data/kleopatra-mime.xml DESTINATION ${KDE_INSTALL_MIMEDIR})
	install(
	PROGRAMS data/kleopatra_signencryptfiles.desktop
	data/kleopatra_signencryptfolders.desktop
	data/kleopatra_decryptverifyfiles.desktop
	data/kleopatra_decryptverifyfolders.desktop
	DESTINATION ${KDE_INSTALL_DATADIR}/kio/servicemenus
	)
	diff --git a/src/view/cardkeysview.cpp b/src/view/cardkeysview.cpp
	new file mode 100644
	index 000000000..ed1772f2f
	--- /dev/null
	+++ b/src/view/cardkeysview.cpp
	@@ -0,0 +1,197 @@
	+/* view/cardkeysview.cpp
	+
	+ This file is part of Kleopatra, the KDE keymanager
	+ SPDX-FileCopyrightText: 2024 g10 Code GmbH
	+ SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
	+
	+ SPDX-License-Identifier: GPL-2.0-or-later
	+*/
	+
	+#include "cardkeysview.h"
	+
	+#include "keytreeview.h"
	+
	+#include <kleopatra_debug.h>
	+
	+#include <commands/detailscommand.h>
	+#include <smartcard/card.h>
	+#include <smartcard/readerstatus.h>
	+#include <utils/qt-cxx20-compat.h>
	+#include <view/progressoverlay.h>
	+
	+#include <Libkleo/Debug>
	+#include <Libkleo/KeyCache>
	+#include <Libkleo/KeyHelpers>
	+#include <Libkleo/KeyListModel>
	+
	+#include <KConfigGroup>
	+#include <KLocalizedString>
	+#include <KSharedConfig>
	+
	+#include <QGpgME/KeyListJob>
	+#include <QGpgME/Protocol>
	+
	+#include <QLabel>
	+#include <QVBoxLayout>
	+
	+#include <gpgme++/context.h>
	+#include <gpgme++/key.h>
	+#include <gpgme++/keylistresult.h>
	+
	+#include <algorithm>
	+
	+using namespace Kleo;
	+using namespace Kleo::SmartCard;
	+using namespace Kleo::Commands;
	+
	+CardKeysView::CardKeysView(QWidget *parent)
	+ : QWidget{parent}
	+ , mTreeView{new KeyTreeView{this}}
	+{
	+ auto mainLayout = new QVBoxLayout{this};
	+ mainLayout->setContentsMargins({});
	+
	+ auto label = new QLabel{QLatin1String{"<b>"} + i18nc("@label:listbox", "Certificates:") + QLatin1String{"</b>"}, this};
	+ label->setBuddy(mTreeView);
	+ mainLayout->addWidget(label, 0, Qt::AlignLeft);
	+
	+ // The certificate view
	+ mTreeView->setHierarchicalModel(AbstractKeyListModel::createHierarchicalKeyListModel(mTreeView));
	+ mTreeView->setHierarchicalView(true);
	+
	+ connect(mTreeView->view(), &QAbstractItemView::doubleClicked, this, [this](const QModelIndex &idx) {
	+ const auto klm = dynamic_cast<KeyListModelInterface *>(mTreeView->view()->model());
	+ if (!klm) {
	+ qCDebug(KLEOPATRA_LOG) << "Unhandled Model: " << mTreeView->view()->model()->metaObject()->className();
	+ return;
	+ }
	+ auto cmd = new DetailsCommand(klm->key(idx));
	+ cmd->setParentWidget(this);
	+ cmd->start();
	+ });
	+ mainLayout->addWidget(mTreeView);
	+
	+ mTreeViewOverlay = new ProgressOverlay{mTreeView, this};
	+ mTreeViewOverlay->hide();
	+
	+ mainLayout->addStretch(1);
	+
	+ const KConfigGroup configGroup{KSharedConfig::openConfig(), "CardKeysView"};
	+ mTreeView->restoreLayout(configGroup);
	+
	+ connect(KeyCache::instance().get(), &KeyCache::keysMayHaveChanged, this, &CardKeysView::loadCertificates);
	+}
	+
	+CardKeysView::~CardKeysView() = default;
	+
	+void CardKeysView::setCard(const Card *card, const std::string &app)
	+{
	+ mSerialNumber = card->serialNumber();
	+ mAppName = app;
	+
	+ loadCertificates();
	+ if (mCertificates.size() != card->keyInfos().size()) {
	+ // the card contains keys we don't know; try to learn them from the card
	+ learnCard();
	+ }
	+}
	+
	+void CardKeysView::loadCertificates()
	+{
	+ qCDebug(KLEOPATRA_LOG) << __func__;
	+ if (mSerialNumber.empty()) {
	+ // ignore KeyCache::keysMayHaveChanged signal until the card has been set
	+ return;
	+ }
	+
	+ const auto card = ReaderStatus::instance()->getCard(mSerialNumber, mAppName);
	+ if (!card) {
	+ qCDebug(KLEOPATRA_LOG) << "Failed to find the" << mAppName << "smart card with the serial number" << mSerialNumber;
	+ return;
	+ }
	+
	+ const auto cardKeyInfos = card->keyInfos();
	+ mCertificates.clear();
	+ mCertificates.reserve(cardKeyInfos.size());
	+
	+ // try to get the certificates from the key cache
	+ for (const auto &cardKeyInfo : cardKeyInfos) {
	+ const auto certificate = KeyCache::instance()->findSubkeyByKeyGrip(cardKeyInfo.grip, GpgME::CMS).parent();
	+ if (!certificate.isNull()) {
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "Found certificate for card key" << cardKeyInfo.grip << "in cache:" << certificate;
	+ mCertificates.push_back(certificate);
	+ } else {
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "Did not find certificate for card key" << cardKeyInfo.grip << "in cache";
	+ }
	+ }
	+ mTreeView->setKeys(mCertificates);
	+
	+ ensureCertificatesAreValidated();
	+}
	+
	+void CardKeysView::ensureCertificatesAreValidated()
	+{
	+ if (mCertificates.empty()) {
	+ return;
	+ }
	+
	+ std::vector<GpgME::Key> certificatesToValidate;
	+ certificatesToValidate.reserve(mCertificates.size());
	+ std::ranges::copy_if(mCertificates, std::back_inserter(certificatesToValidate), [this](const auto &cert) {
	+ // don't bother validating certificates that have expired or are otherwise invalid
	+ return !cert.isBad() && !mValidatedCertificates.contains(cert);
	+ });
	+ if (!certificatesToValidate.empty()) {
	+ startCertificateValidation(certificatesToValidate);
	+ mValidatedCertificates.insert(certificatesToValidate.cbegin(), certificatesToValidate.cend());
	+ }
	+}
	+
	+void CardKeysView::startCertificateValidation(const std::vector<GpgME::Key> &certificates)
	+{
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "Validating certificates" << certificates;
	+ auto job = std::unique_ptr<QGpgME::KeyListJob>{QGpgME::smime()->keyListJob(false, true, true)};
	+ auto ctx = QGpgME::Job::context(job.get());
	+ ctx->addKeyListMode(GpgME::WithSecret);
	+
	+ connect(job.get(), &QGpgME::KeyListJob::result, this, &CardKeysView::certificateValidationDone);
	+
	+ job->start(Kleo::getFingerprints(certificates));
	+ job.release();
	+}
	+
	+void CardKeysView::certificateValidationDone(const GpgME::KeyListResult &result, const std::vector<GpgME::Key> &validatedCertificates)
	+{
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "certificates:" << validatedCertificates;
	+ if (result.error()) {
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "Validating certificates failed:" << result.error();
	+ return;
	+ }
	+ // replace the current certificates with the validated certificates
	+ for (const auto &validatedCert : validatedCertificates) {
	+ const auto fpr = validatedCert.primaryFingerprint();
	+ const auto it = std::find_if(mCertificates.begin(), mCertificates.end(), [fpr](const auto &cert) {
	+ return !qstrcmp(fpr, cert.primaryFingerprint());
	+ });
	+ if (it != mCertificates.end()) {
	+ *it = validatedCert;
	+ } else {
	+ qCDebug(KLEOPATRA_LOG) << __func__ << "Didn't find validated certificate in certificate list:" << validatedCert;
	+ }
	+ }
	+ mTreeView->setKeys(mCertificates);
	+}
	+
	+void CardKeysView::learnCard()
	+{
	+ qCDebug(KLEOPATRA_LOG) << __func__;
	+ mTreeViewOverlay->setText(i18nc("@info", "Reading certificates from smart card ..."));
	+ mTreeViewOverlay->showOverlay();
	+ ReaderStatus::mutableInstance()->learnCards(GpgME::CMS);
	+ connect(ReaderStatus::instance(), &ReaderStatus::cardsLearned, this, [this]() {
	+ qCDebug(KLEOPATRA_LOG) << "ReaderStatus::cardsLearned";
	+ mTreeViewOverlay->hideOverlay();
	+ });
	+}
	+
	+#include "moc_cardkeysview.cpp"
	diff --git a/src/view/netkeywidget.h b/src/view/cardkeysview.h
	similarity index 52%
	copy from src/view/netkeywidget.h
	copy to src/view/cardkeysview.h
	index 2d8e44cae..931be25a4 100644
	--- a/src/view/netkeywidget.h
	+++ b/src/view/cardkeysview.h
	@@ -1,79 +1,62 @@
	-/* view/netkeywidget.h
	+/* view/cardkeysview.h

	This file is part of Kleopatra, the KDE keymanager
	- SPDX-FileCopyrightText: 2017 Intevation GmbH
	+ SPDX-FileCopyrightText: 2024 g10 Code GmbH
	+ SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>

	SPDX-License-Identifier: GPL-2.0-or-later
	*/
	#pragma once

	#include <Libkleo/Predicates>

	#include <QWidget>

	-#include <gpgme++/error.h>
	-
	#include <set>
	#include <string>
	#include <vector>

	-class QLabel;
	-class QPushButton;
	-class QScrollArea;
	-
	namespace GpgME
	{
	class Key;
	class KeyListResult;
	}

	namespace Kleo
	{
	-class NullPinWidget;
	class KeyTreeView;
	class ProgressOverlay;

	namespace SmartCard
	{
	-class NetKeyCard;
	-} // namespace SmartCard
	+class Card;
	+}

	-class NetKeyWidget : public QWidget
	+class CardKeysView : public QWidget
	{
	Q_OBJECT
	public:
	- explicit NetKeyWidget(QWidget *parent = nullptr);
	- ~NetKeyWidget() override;
	+ explicit CardKeysView(QWidget *parent = nullptr);
	+ ~CardKeysView() override;

	- void setCard(const SmartCard::NetKeyCard *card);
	+ void setCard(const SmartCard::Card *card, const std::string &app);

	private:
	void loadCertificates();
	void ensureCertificatesAreValidated();
	void startCertificateValidation(const std::vector<GpgME::Key> &certificates);
	void certificateValidationDone(const GpgME::KeyListResult &result, const std::vector<GpgME::Key> &keys);
	void learnCard();
	- void doChangePin(const std::string &keyRef);
	- void createKeyFromCardKeys();
	- void createCSR();

	private:
	std::string mSerialNumber;
	+ std::string mAppName;
	std::vector<GpgME::Key> mCertificates;

	using KeySet = std::set<GpgME::Key, _detail::ByFingerprint<std::less>>;
	KeySet mValidatedCertificates;

	- QLabel *mSerialNumberLabel = nullptr;
	- QLabel *mVersionLabel = nullptr;
	- QLabel *mErrorLabel = nullptr;
	- NullPinWidget *mNullPinWidget = nullptr;
	- QPushButton *mKeyForCardKeysButton = nullptr;
	- QPushButton *mCreateCSRButton = nullptr;
	- QPushButton *mChangeNKSPINBtn = nullptr;
	- QPushButton *mChangeSigGPINBtn = nullptr;
	KeyTreeView *mTreeView = nullptr;
	ProgressOverlay *mTreeViewOverlay = nullptr;
	- QScrollArea *mArea = nullptr;
	};
	} // namespace Kleo
	diff --git a/src/view/netkeywidget.cpp b/src/view/netkeywidget.cpp
	index 7f1a673e6..2d68036cd 100644
	--- a/src/view/netkeywidget.cpp
	+++ b/src/view/netkeywidget.cpp
	@@ -1,412 +1,275 @@
	/* view/netkeywidget.cpp

	This file is part of Kleopatra, the KDE keymanager
	SPDX-FileCopyrightText: 2017 Intevation GmbH

	SPDX-License-Identifier: GPL-2.0-or-later
	*/
	#include "netkeywidget.h"

	-#include "keytreeview.h"
	+#include "cardkeysview.h"
	#include "kleopatraapplication.h"
	#include "nullpinwidget.h"
	#include "systrayicon.h"

	#include "kleopatra_debug.h"

	#include "smartcard/netkeycard.h"
	#include "smartcard/readerstatus.h"

	#include "commands/changepincommand.h"
	#include "commands/createcsrforcardkeycommand.h"
	#include "commands/createopenpgpkeyfromcardkeyscommand.h"
	-#include "commands/detailscommand.h"
	-#include "utils/qt-cxx20-compat.h"
	-#include "view/progressoverlay.h"

	#include <Libkleo/Algorithm>
	#include <Libkleo/Compliance>
	#include <Libkleo/Debug>
	#include <Libkleo/KeyCache>
	#include <Libkleo/KeyHelpers>
	#include <Libkleo/KeyListModel>

	-#include <KConfigGroup>
	#include <KLocalizedString>
	#include <KMessageBox>
	#include <KSeparator>
	-#include <KSharedConfig>
	-
	-#include <QGpgME/KeyListJob>
	-#include <QGpgME/Protocol>

	#include <QHBoxLayout>
	#include <QInputDialog>
	#include <QLabel>
	#include <QPushButton>
	#include <QScrollArea>
	-#include <QTreeView>
	#include <QVBoxLayout>

	-#include <gpgme++/context.h>
	#include <gpgme++/engineinfo.h>
	-#include <gpgme++/keylistresult.h>

	using namespace Kleo;
	using namespace Kleo::SmartCard;
	using namespace Kleo::Commands;

	NetKeyWidget::NetKeyWidget(QWidget *parent)
	: QWidget(parent)
	, mSerialNumberLabel(new QLabel(this))
	, mVersionLabel(new QLabel(this))
	, mErrorLabel(new QLabel(this))
	, mNullPinWidget(new NullPinWidget(this))
	, mChangeNKSPINBtn(new QPushButton(this))
	, mChangeSigGPINBtn(new QPushButton(this))
	- , mTreeView(new KeyTreeView(this))
	+ , mCardKeysView{new CardKeysView{this}}
	, mArea(new QScrollArea)
	{
	auto vLay = new QVBoxLayout;

	// Set up the scroll are
	mArea->setFrameShape(QFrame::NoFrame);
	mArea->setWidgetResizable(true);
	auto mAreaWidget = new QWidget;
	mAreaWidget->setLayout(vLay);
	mArea->setWidget(mAreaWidget);
	auto scrollLay = new QVBoxLayout(this);
	scrollLay->setContentsMargins(0, 0, 0, 0);
	scrollLay->addWidget(mArea);

	// Add general widgets
	mVersionLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
	vLay->addWidget(mVersionLabel, 0, Qt::AlignLeft);

	mSerialNumberLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);

	auto hLay1 = new QHBoxLayout;
	hLay1->addWidget(new QLabel(i18n("Serial number:")));
	hLay1->addWidget(mSerialNumberLabel);
	hLay1->addStretch(1);
	vLay->addLayout(hLay1);

	vLay->addWidget(mNullPinWidget);

	- vLay->addWidget(new KSeparator(Qt::Horizontal));
	- vLay->addWidget(new QLabel(QStringLiteral("<b>%1</b>").arg(i18n("Certificates:"))), 0, Qt::AlignLeft);
	-
	mErrorLabel->setVisible(false);
	vLay->addWidget(mErrorLabel);

	- // The certificate view
	- mTreeView->setHierarchicalModel(AbstractKeyListModel::createHierarchicalKeyListModel(mTreeView));
	- mTreeView->setHierarchicalView(true);
	-
	- connect(mTreeView->view(), &QAbstractItemView::doubleClicked, this, [this](const QModelIndex &idx) {
	- const auto klm = dynamic_cast<KeyListModelInterface *>(mTreeView->view()->model());
	- if (!klm) {
	- qCDebug(KLEOPATRA_LOG) << "Unhandled Model: " << mTreeView->view()->model()->metaObject()->className();
	- return;
	- }
	- auto cmd = new DetailsCommand(klm->key(idx));
	- cmd->setParentWidget(this);
	- cmd->start();
	- });
	- vLay->addWidget(mTreeView);
	-
	- mTreeViewOverlay = new ProgressOverlay{mTreeView, this};
	- mTreeViewOverlay->hide();
	+ vLay->addWidget(new KSeparator(Qt::Horizontal));
	+ vLay->addWidget(mCardKeysView);

	// The action area
	vLay->addWidget(new KSeparator(Qt::Horizontal));
	vLay->addWidget(new QLabel(QStringLiteral("<b>%1</b>").arg(i18n("Actions:"))), 0, Qt::AlignLeft);

	auto actionLayout = new QHBoxLayout();

	if (CreateOpenPGPKeyFromCardKeysCommand::isSupported()) {
	mKeyForCardKeysButton = new QPushButton(this);
	mKeyForCardKeysButton->setText(i18nc("@action:button", "Create OpenPGP Key"));
	mKeyForCardKeysButton->setToolTip(i18nc("@info:tooltip", "Create an OpenPGP key for the keys stored on the card."));
	actionLayout->addWidget(mKeyForCardKeysButton);
	connect(mKeyForCardKeysButton, &QPushButton::clicked, this, &NetKeyWidget::createKeyFromCardKeys);
	}

	if (!(engineInfo(GpgME::GpgSMEngine).engineVersion() < "2.2.26")) { // see https://dev.gnupg.org/T5184
	mCreateCSRButton = new QPushButton(this);
	mCreateCSRButton->setText(i18nc("@action:button", "Create CSR"));
	mCreateCSRButton->setToolTip(i18nc("@info:tooltip", "Create a certificate signing request for a key stored on the card."));
	mCreateCSRButton->setEnabled(false);
	actionLayout->addWidget(mCreateCSRButton);
	connect(mCreateCSRButton, &QPushButton::clicked, this, [this]() {
	createCSR();
	});
	}

	mChangeNKSPINBtn->setText(i18nc("NKS is an identifier for a type of keys on a NetKey card", "Change NKS PIN"));
	mChangeSigGPINBtn->setText(i18nc("SigG is an identifier for a type of keys on a NetKey card", "Change SigG PIN"));

	connect(mChangeNKSPINBtn, &QPushButton::clicked, this, [this]() {
	doChangePin(NetKeyCard::nksPinKeyRef());
	});
	connect(mChangeSigGPINBtn, &QPushButton::clicked, this, [this]() {
	doChangePin(NetKeyCard::sigGPinKeyRef());
	});

	actionLayout->addWidget(mChangeNKSPINBtn);
	actionLayout->addWidget(mChangeSigGPINBtn);
	actionLayout->addStretch(1);

	vLay->addLayout(actionLayout);
	vLay->addStretch(1);
	-
	- const KConfigGroup configGroup(KSharedConfig::openConfig(), "NetKeyCardView");
	- mTreeView->restoreLayout(configGroup);
	-
	- connect(KeyCache::instance().get(), &KeyCache::keysMayHaveChanged, this, &NetKeyWidget::loadCertificates);
	}

	NetKeyWidget::~NetKeyWidget() = default;

	namespace
	{
	std::vector<KeyPairInfo> getKeysSuitableForCSRCreation(const NetKeyCard *netKeyCard)
	{
	if (netKeyCard->hasNKSNullPin()) {
	return {};
	}

	std::vector<KeyPairInfo> keys;
	Kleo::copy_if(netKeyCard->keyInfos(), std::back_inserter(keys), [](const auto &keyInfo) {
	if (keyInfo.keyRef.substr(0, 9) == "NKS-SIGG.") {
	// SigG certificates for qualified signatures are issued with the physical cards;
	// it's not possible to request a certificate for them
	return false;
	}
	return keyInfo.canSign() //
	&& (keyInfo.keyRef.substr(0, 9) == "NKS-NKS3.") //
	&& DeVSCompliance::algorithmIsCompliant(keyInfo.algorithm);
	});

	return keys;
	}
	}

	void NetKeyWidget::setCard(const NetKeyCard *card)
	{
	mSerialNumber = card->serialNumber();
	mVersionLabel->setText(i18nc("1 is a Version number", "NetKey v%1 Card", card->appVersion()));
	mSerialNumberLabel->setText(card->displaySerialNumber());

	mNullPinWidget->setSerialNumber(mSerialNumber);
	/* According to users of NetKey Cards it is fairly uncommon
	* to use SigG Certificates at all. So it should be optional to set the pins. */
	mNullPinWidget->setVisible(card->hasNKSNullPin() /\|\| card->hasSigGNullPin()/);

	mNullPinWidget->setSigGVisible(false /card->hasSigGNullPin()/);
	mNullPinWidget->setNKSVisible(card->hasNKSNullPin());
	mChangeNKSPINBtn->setEnabled(!card->hasNKSNullPin());

	if (card->hasSigGNullPin()) {
	mChangeSigGPINBtn->setText(i18nc("SigG is an identifier for a type of keys on a NetKey card", "Set SigG PIN"));
	} else {
	mChangeSigGPINBtn->setText(i18nc("SigG is an identifier for a type of keys on a NetKey card", "Change SigG PIN"));
	}

	const auto errMsg = card->errorMsg();
	if (!errMsg.isEmpty()) {
	mErrorLabel->setText(QStringLiteral("<b>%1:</b> %2").arg(i18n("Error"), errMsg));
	mErrorLabel->setVisible(true);
	} else {
	mErrorLabel->setVisible(false);
	}

	if (mKeyForCardKeysButton) {
	mKeyForCardKeysButton->setEnabled(!card->hasNKSNullPin() && card->hasSigningKey() && card->hasEncryptionKey()
	&& DeVSCompliance::algorithmIsCompliant(card->keyInfo(card->signingKeyRef()).algorithm)
	&& DeVSCompliance::algorithmIsCompliant(card->keyInfo(card->encryptionKeyRef()).algorithm));
	}
	if (mCreateCSRButton) {
	mCreateCSRButton->setEnabled(!getKeysSuitableForCSRCreation(card).empty());
	}

	- loadCertificates();
	- if (mCertificates.size() != card->keyInfos().size()) {
	- // the card contains keys we don't know; try to learn them from the card
	- learnCard();
	- }
	-}
	-
	-void NetKeyWidget::loadCertificates()
	-{
	- qCDebug(KLEOPATRA_LOG) << __func__;
	- if (mSerialNumber.empty()) {
	- // ignore KeyCache::keysMayHaveChanged signal until the card has been set
	- return;
	- }
	-
	- const auto netKeyCard = ReaderStatus::instance()->getCard<NetKeyCard>(mSerialNumber);
	- if (!netKeyCard) {
	- qCDebug(KLEOPATRA_LOG) << "Failed to find the smartcard with the serial number:" << mSerialNumber;
	- return;
	- }
	-
	- const auto cardKeyInfos = netKeyCard->keyInfos();
	- mCertificates.clear();
	- mCertificates.reserve(cardKeyInfos.size());
	-
	- // try to get the certificates from the key cache
	- for (const auto &cardKeyInfo : cardKeyInfos) {
	- const auto certificate = KeyCache::instance()->findSubkeyByKeyGrip(cardKeyInfo.grip, GpgME::CMS).parent();
	- if (!certificate.isNull()) {
	- qCDebug(KLEOPATRA_LOG) << __func__ << "Found certificate for card key" << cardKeyInfo.grip << "in cache:" << certificate;
	- mCertificates.push_back(certificate);
	- } else {
	- qCDebug(KLEOPATRA_LOG) << __func__ << "Did not find certificate for card key" << cardKeyInfo.grip << "in cache";
	- }
	- }
	- mTreeView->setKeys(mCertificates);
	-
	- ensureCertificatesAreValidated();
	-}
	-
	-void NetKeyWidget::ensureCertificatesAreValidated()
	-{
	- if (mCertificates.empty()) {
	- return;
	- }
	-
	- std::vector<GpgME::Key> certificatesToValidate;
	- certificatesToValidate.reserve(mCertificates.size());
	- Kleo::copy_if(mCertificates, std::back_inserter(certificatesToValidate), [this](const auto &cert) {
	- // don't bother validating certificates that have expired or are otherwise invalid
	- return !cert.isBad() && !mValidatedCertificates.contains(cert);
	- });
	- if (!certificatesToValidate.empty()) {
	- startCertificateValidation(certificatesToValidate);
	- mValidatedCertificates.insert(certificatesToValidate.cbegin(), certificatesToValidate.cend());
	- }
	-}
	-
	-void NetKeyWidget::startCertificateValidation(const std::vector<GpgME::Key> &certificates)
	-{
	- qCDebug(KLEOPATRA_LOG) << __func__ << "Validating certificates" << certificates;
	- auto job = std::unique_ptr<QGpgME::KeyListJob>{QGpgME::smime()->keyListJob(false, true, true)};
	- auto ctx = QGpgME::Job::context(job.get());
	- ctx->addKeyListMode(GpgME::WithSecret);
	-
	- connect(job.get(), &QGpgME::KeyListJob::result, this, &NetKeyWidget::certificateValidationDone);
	-
	- job->start(Kleo::getFingerprints(certificates));
	- job.release();
	-}
	-
	-void NetKeyWidget::certificateValidationDone(const GpgME::KeyListResult &result, const std::vector<GpgME::Key> &validatedCertificates)
	-{
	- qCDebug(KLEOPATRA_LOG) << __func__ << "certificates:" << validatedCertificates;
	- if (result.error()) {
	- qCDebug(KLEOPATRA_LOG) << __func__ << "Validating certificates failed:" << result.error();
	- return;
	- }
	- // replace the current certificates with the validated certificates
	- for (const auto &validatedCert : validatedCertificates) {
	- const auto fpr = validatedCert.primaryFingerprint();
	- const auto it = std::find_if(mCertificates.begin(), mCertificates.end(), [fpr](const auto &cert) {
	- return !qstrcmp(fpr, cert.primaryFingerprint());
	- });
	- if (it != mCertificates.end()) {
	- *it = validatedCert;
	- } else {
	- qCDebug(KLEOPATRA_LOG) << __func__ << "Didn't find validated certificate in certificate list:" << validatedCert;
	- }
	- }
	- mTreeView->setKeys(mCertificates);
	-}
	-
	-void NetKeyWidget::learnCard()
	-{
	- qCDebug(KLEOPATRA_LOG) << __func__;
	- mTreeViewOverlay->setText(i18nc("@info", "Reading certificates from smart card ..."));
	- mTreeViewOverlay->showOverlay();
	- ReaderStatus::mutableInstance()->learnCards(GpgME::CMS);
	- connect(ReaderStatus::instance(), &ReaderStatus::cardsLearned, this, [this]() {
	- qCDebug(KLEOPATRA_LOG) << "ReaderStatus::cardsLearned";
	- mTreeViewOverlay->hideOverlay();
	- });
	+ mCardKeysView->setCard(card, NetKeyCard::AppName);
	}

	void NetKeyWidget::doChangePin(const std::string &keyRef)
	{
	const auto netKeyCard = ReaderStatus::instance()->getCard<NetKeyCard>(mSerialNumber);
	if (!netKeyCard) {
	KMessageBox::error(this, i18n("Failed to find the smartcard with the serial number: %1", QString::fromStdString(mSerialNumber)));
	return;
	}

	auto cmd = new ChangePinCommand(mSerialNumber, NetKeyCard::AppName, this);
	this->setEnabled(false);
	connect(cmd, &ChangePinCommand::finished, this, [this]() {
	this->setEnabled(true);
	});
	cmd->setKeyRef(keyRef);
	if ((keyRef == NetKeyCard::nksPinKeyRef() && netKeyCard->hasNKSNullPin()) //
	\|\| (keyRef == NetKeyCard::sigGPinKeyRef() && netKeyCard->hasSigGNullPin())) {
	cmd->setMode(ChangePinCommand::NullPinMode);
	}
	cmd->start();
	}

	void NetKeyWidget::createKeyFromCardKeys()
	{
	auto cmd = new CreateOpenPGPKeyFromCardKeysCommand(mSerialNumber, NetKeyCard::AppName, this);
	this->setEnabled(false);
	connect(cmd, &CreateOpenPGPKeyFromCardKeysCommand::finished, this, [this]() {
	this->setEnabled(true);
	});
	cmd->start();
	}

	namespace
	{
	std::string getKeyRef(const std::vector<KeyPairInfo> &keys, QWidget *parent)
	{
	QStringList options;
	for (const auto &key : keys) {
	options << QStringLiteral("%1 - %2").arg(QString::fromStdString(key.keyRef), QString::fromStdString(key.grip));
	}

	bool ok;
	const QString choice = QInputDialog::getItem(parent,
	i18n("Select Key"),
	i18n("Please select the key you want to create a certificate signing request for:"),
	options,
	/* current= */ 0,
	/* editable= */ false,
	&ok);
	return ok ? keys[options.indexOf(choice)].keyRef : std::string();
	}
	}

	void NetKeyWidget::createCSR()
	{
	const auto netKeyCard = ReaderStatus::instance()->getCard<NetKeyCard>(mSerialNumber);
	if (!netKeyCard) {
	KMessageBox::error(this, i18n("Failed to find the smartcard with the serial number: %1", QString::fromStdString(mSerialNumber)));
	return;
	}
	const auto suitableKeys = getKeysSuitableForCSRCreation(netKeyCard.get());
	if (suitableKeys.empty()) {
	KMessageBox::error(this, i18n("Sorry! No keys suitable for creating a certificate signing request found on the smartcard."));
	return;
	}
	const auto keyRef = getKeyRef(suitableKeys, this);
	if (keyRef.empty()) {
	return;
	}
	auto cmd = new CreateCSRForCardKeyCommand(keyRef, mSerialNumber, NetKeyCard::AppName, this);
	this->setEnabled(false);
	connect(cmd, &CreateCSRForCardKeyCommand::finished, this, [this]() {
	this->setEnabled(true);
	});
	cmd->start();
	}
	diff --git a/src/view/netkeywidget.h b/src/view/netkeywidget.h
	index 2d8e44cae..1dbf73924 100644
	--- a/src/view/netkeywidget.h
	+++ b/src/view/netkeywidget.h
	@@ -1,79 +1,62 @@
	/* view/netkeywidget.h

	This file is part of Kleopatra, the KDE keymanager
	SPDX-FileCopyrightText: 2017 Intevation GmbH

	SPDX-License-Identifier: GPL-2.0-or-later
	*/
	#pragma once

	#include <Libkleo/Predicates>

	#include <QWidget>

	#include <gpgme++/error.h>

	#include <set>
	#include <string>
	#include <vector>

	class QLabel;
	class QPushButton;
	class QScrollArea;

	-namespace GpgME
	-{
	-class Key;
	-class KeyListResult;
	-}
	-
	namespace Kleo
	{
	class NullPinWidget;
	-class KeyTreeView;
	-class ProgressOverlay;
	+class CardKeysView;

	namespace SmartCard
	{
	class NetKeyCard;
	-} // namespace SmartCard
	+}

	class NetKeyWidget : public QWidget
	{
	Q_OBJECT
	public:
	explicit NetKeyWidget(QWidget *parent = nullptr);
	~NetKeyWidget() override;

	void setCard(const SmartCard::NetKeyCard *card);

	private:
	- void loadCertificates();
	- void ensureCertificatesAreValidated();
	- void startCertificateValidation(const std::vector<GpgME::Key> &certificates);
	- void certificateValidationDone(const GpgME::KeyListResult &result, const std::vector<GpgME::Key> &keys);
	- void learnCard();
	void doChangePin(const std::string &keyRef);
	void createKeyFromCardKeys();
	void createCSR();

	private:
	std::string mSerialNumber;
	- std::vector<GpgME::Key> mCertificates;
	-
	- using KeySet = std::set<GpgME::Key, _detail::ByFingerprint<std::less>>;
	- KeySet mValidatedCertificates;

	QLabel *mSerialNumberLabel = nullptr;
	QLabel *mVersionLabel = nullptr;
	QLabel *mErrorLabel = nullptr;
	NullPinWidget *mNullPinWidget = nullptr;
	QPushButton *mKeyForCardKeysButton = nullptr;
	QPushButton *mCreateCSRButton = nullptr;
	QPushButton *mChangeNKSPINBtn = nullptr;
	QPushButton *mChangeSigGPINBtn = nullptr;
	- KeyTreeView *mTreeView = nullptr;
	- ProgressOverlay *mTreeViewOverlay = nullptr;
	+ CardKeysView *mCardKeysView = nullptr;
	QScrollArea *mArea = nullptr;
	};
	} // namespace Kleo

File Metadata

Mime Type: text/x-diff
Expires: Sat, Feb 7, 5:29 PM (20 h, 29 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: a6/fe/8234635c948a476eac5bcb99d91a

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions