Add revision: v1.10.4

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0)
 
 IF(POLICY CMP0020)
 	CMAKE_POLICY(SET CMP0020 NEW)
@@ -25,7 +25,7 @@ ELSE()
 ENDIF()
 
 
-PROJECT(AusweisApp2 VERSION 1.10.3 LANGUAGES ${LANGUAGES})
+PROJECT(AusweisApp2 VERSION 1.10.4 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

cmake/Packaging.cmake

@@ -90,11 +90,6 @@ IF(WIN32)
 	ENDIF()
 
 ELSEIF(IOS)
-	FIND_PROGRAM(xcrun xcrun CMAKE_FIND_ROOT_PATH_BOTH)
-	IF(NOT xcrun)
-		MESSAGE(FATAL_ERROR "Cannot find xcrun to create IPAs")
-	ENDIF()
-
 	FILE(WRITE ${PROJECT_BINARY_DIR}/ipa.cmake "
 		SET(BUNDLE_DIRS \"\${CONFIG}-iphoneos;UninstalledProducts;UninstalledProducts/iphoneos\")
 
@@ -112,7 +107,9 @@ ELSEIF(IOS)
 			MESSAGE(FATAL_ERROR \"Bundle directory does not exist\")
 		ENDIF()
 
-		EXECUTE_PROCESS(COMMAND ${xcrun} -sdk iphoneos PackageApplication \${BundleDir} -o ${PROJECT_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.ipa)
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory \${BundleDir} Payload/AusweisApp2.app)
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E tar cf \"${CPACK_PACKAGE_FILE_NAME}.ipa\" --format=zip Payload)
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove_directory Payload)
 	")
 
 	ADD_CUSTOM_TARGET(ipa COMMAND ${CMAKE_COMMAND} -DCONFIG=$<CONFIGURATION> -P ${CMAKE_BINARY_DIR}/ipa.cmake)

cmake/Tools.cmake

@@ -140,7 +140,7 @@ IF(UNCRUSTIFY)
 	EXECUTE_PROCESS(COMMAND ${UNCRUSTIFY} --version OUTPUT_VARIABLE UNCRUSTIFY_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 	STRING(REPLACE "uncrustify " "" UNCRUSTIFY_VERSION ${UNCRUSTIFY_VERSION})
 
-	SET(UNCRUSTIFY_NEEDED_VERSION "0.64")
+	SET(UNCRUSTIFY_NEEDED_VERSION "0.65")
 	IF("${UNCRUSTIFY_VERSION}" STRLESS "${UNCRUSTIFY_NEEDED_VERSION}")
 		MESSAGE(WARNING "Uncrustify seems to be too old. Use at least ${UNCRUSTIFY_NEEDED_VERSION}... you are using: ${UNCRUSTIFY_VERSION}")
 	ELSE()

docs/releasenotes/1.10.4.rst

@@ -0,0 +1,19 @@
+AusweisApp2 1.10.4
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 22. September 2017
+
+
+
+Anwender
+""""""""
+  - Anzeige des Verwendungszwecks korrigiert.
+
+  - Links zu den Treibern von Kartenlesegeräten
+    wurden aktualisiert.
+
+
+Entwickler
+""""""""""
+  - Der XML-ConnectionHandleType ist nun korrigiert und
+    schemakonform.

docs/releasenotes/appcast.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   1.10.4
    1.10.3
    1.10.2
    1.10.1

docs/releasenotes/conf.py.in

@@ -42,7 +42,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'AusweisApp2'
-copyright = '2016, Governikus GmbH & Co. KG'
+copyright = '2016-2017, Governikus GmbH & Co. KG'
 author = 'Governikus GmbH & Co. KG'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -145,7 +145,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'AusweisApp2_ReleaseNotes.tex', 'AusweisApp2 Release Notes',
+  (master_doc, 'AusweisApp2-@VERSION_DVCS@-ReleaseNotes.tex', 'AusweisApp2 Release Notes',
    'Governikus GmbH \& Co. KG', 'howto'),
 ]
 

docs/releasenotes/versions.rst

@@ -6,6 +6,7 @@ Versionszweig 1.10
 .. toctree::
    :maxdepth: 1
 
+   1.10.4
    1.10.3
    1.10.2
    1.10.1

src/CMakeLists.txt

@@ -155,11 +155,6 @@ IF(IOS)
 	SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
 	SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "8.0")
 	SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
-	IF(${CMAKE_BUILD_TYPE} STREQUAL "DEBUG")
-		SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer: Marco von der Puetten")
-	ELSE()
-		SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Distribution: Governikus GmbH & Co. KG")
-	ENDIF()
 
 	# prevent xcode to convert multiple png files to tiff
 	SET_TARGET_PROPERTIES(AusweisApp PROPERTIES XCODE_ATTRIBUTE_COMBINE_HIDPI_IMAGES "NO")

src/activation/intent/IntentActivationHandler.h

@@ -35,7 +35,7 @@ class IntentActivationHandler
 	Q_INTERFACES(governikus::ActivationHandler)
 
 #ifdef Q_OS_ANDROID
-	friend void::Java_com_governikus_ausweisapp2_MainActivity_triggerActivation(JNIEnv*, jobject, jstring);
+	friend void ::Java_com_governikus_ausweisapp2_MainActivity_triggerActivation(JNIEnv*, jobject, jstring);
 #endif
 
 	public:

src/activation/intent/MainActivity.java

@@ -8,8 +8,8 @@ import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.nfc.NfcAdapter;
-import android.nfc.Tag;
 import android.nfc.tech.IsoDep;
+import android.nfc.Tag;
 import android.os.Bundle;
 import android.util.Log;
 import org.qtproject.qt5.android.bindings.QtActivity;

src/activation/webservice/WebserviceActivationContext.cpp

@@ -6,10 +6,10 @@
 
 #include "WebserviceActivationContext.h"
 
-#include "Template.h"
-#include "UrlUtil.h"
 #include "qhttpserver/qhttprequest.h"
 #include "qhttpserver/qhttpresponse.h"
+#include "Template.h"
+#include "UrlUtil.h"
 
 #include <QFile>
 #include <QLoggingCategory>

src/activation/webservice/WebserviceActivationHandler.h

@@ -28,7 +28,7 @@ class WebserviceActivationHandler
 	Q_PLUGIN_METADATA(IID "governikus.ActivationHandler" FILE "metadata.json")
 	Q_INTERFACES(governikus::ActivationHandler)
 
-	friend class::test_WebserviceActivationHandler;
+	friend class ::test_WebserviceActivationHandler;
 
 	QHttpServer mHttpServer;
 

src/aidl/UIPlugInAidl.cpp

@@ -17,9 +17,9 @@
 #include <QThread>
 
 #ifdef Q_OS_ANDROID
+#include <jni.h>
 #include <QtAndroidExtras/QAndroidJniEnvironment>
 #include <QtAndroidExtras/QtAndroid>
-#include <jni.h>
 #endif
 
 

src/card/base/CardConnection.h

@@ -8,15 +8,15 @@
 
 #pragma once
 
+#include "asn1/Chat.h"
+#include "asn1/CVCertificate.h"
+#include "asn1/CVCertificateChain.h"
+#include "command/BaseCardCommand.h"
 #include "CardConnectionWorker.h"
 #include "Commands.h"
 #include "InputAPDUInfo.h"
 #include "ReaderInfo.h"
 #include "SmartCardDefinitions.h"
-#include "asn1/CVCertificate.h"
-#include "asn1/CVCertificateChain.h"
-#include "asn1/Chat.h"
-#include "command/BaseCardCommand.h"
 
 #include "command/DestroyPaceChannelCommand.h"
 #include "command/EstablishPaceChannelCommand.h"

src/card/base/CardConnectionWorker.h

@@ -6,15 +6,15 @@
 
 #pragma once
 
+#include "asn1/SecurityInfos.h"
 #include "Apdu.h"
 #include "Commands.h"
 #include "EstablishPACEChannel.h"
 #include "FileRef.h"
+#include "pace/SecureMessaging.h"
 #include "Reader.h"
 #include "ReturnCode.h"
 #include "SmartCardDefinitions.h"
-#include "asn1/SecurityInfos.h"
-#include "pace/SecureMessaging.h"
 
 #include <QByteArray>
 

src/card/base/CardInfo.cpp

@@ -6,10 +6,10 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "CardConnectionWorker.h"
-#include "CardInfo.h"
 #include "asn1/PACEInfo.h"
 #include "asn1/SecurityInfos.h"
+#include "CardConnectionWorker.h"
+#include "CardInfo.h"
 
 #include <QDebug>
 #include <QLoggingCategory>

src/card/base/CardInfo.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "SmartCardDefinitions.h"
 #include "asn1/SecurityInfos.h"
+#include "SmartCardDefinitions.h"
 
 #include <QSharedPointer>
 

src/card/base/Commands.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include "asn1/Chat.h"
 #include "Apdu.h"
 #include "FileRef.h"
 #include "ReturnCode.h"
 #include "SmartCardDefinitions.h"
-#include "asn1/Chat.h"
 
 #include <QtEndian>
 

src/card/base/EstablishPACEChannel.cpp

@@ -2,9 +2,9 @@
  * \copyright Copyright (c) 2015 Governikus GmbH & Co. KG
  */
 
+#include "asn1/ASN1Util.h"
 #include "EstablishPACEChannel.h"
 #include "PersoSimWorkaround.h"
-#include "asn1/ASN1Util.h"
 
 #include <QDataStream>
 #include <QLoggingCategory>

src/card/base/EstablishPACEChannel.h

@@ -6,12 +6,12 @@
 
 #pragma once
 
-#include "Apdu.h"
-#include "ReturnCode.h"
-#include "SmartCardDefinitions.h"
 #include "asn1/ASN1TemplateUtil.h"
 #include "asn1/CertificateDescription.h"
 #include "asn1/SecurityInfos.h"
+#include "Apdu.h"
+#include "ReturnCode.h"
+#include "SmartCardDefinitions.h"
 
 #include <QByteArray>
 

src/card/base/GeneralAuthenticateResponse.cpp

@@ -4,8 +4,8 @@
  * \copyright Copyright (c) 2015 Governikus GmbH & Co. KG
  */
 
-#include "GeneralAuthenticateResponse.h"
 #include "asn1/ASN1Util.h"
+#include "GeneralAuthenticateResponse.h"
 
 #include <QLoggingCategory>
 

src/card/base/GeneralAuthenticateResponse.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Apdu.h"
 #include "asn1/ASN1TemplateUtil.h"
+#include "Apdu.h"
 
 
 namespace governikus

src/card/base/Reader.cpp

@@ -3,10 +3,10 @@
  */
 
 
+#include "asn1/PACEInfo.h"
 #include "CardConnectionWorker.h"
 #include "PersoSimWorkaround.h"
 #include "Reader.h"
-#include "asn1/PACEInfo.h"
 
 #include <QLoggingCategory>
 

src/card/base/ReaderManager.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
+#include "command/CreateCardConnectionCommand.h"
 #include "Reader.h"
 #include "ReaderManagerWorker.h"
-#include "command/CreateCardConnectionCommand.h"
 
 #include <QPointer>
 #include <QThread>

src/card/base/SecureMessagingResponse.cpp

@@ -2,8 +2,8 @@
  * \copyright Copyright (c) 2015 Governikus GmbH & Co. KG
  */
 
-#include "SecureMessagingResponse.h"
 #include "asn1/ASN1Util.h"
+#include "SecureMessagingResponse.h"
 
 #include <QLoggingCategory>
 

src/card/base/SecureMessagingResponse.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "Commands.h"
 #include "asn1/ASN1TemplateUtil.h"
+#include "Commands.h"
 
 
 namespace governikus

src/card/base/asn1/ASN1TemplateUtil.h

@@ -140,7 +140,7 @@ static const int CB_ERROR = 0;
 	}\
 \
 	template<>\
-	name * decodeAsn1Object<name>(name** pObject, const unsigned char** pData, long pDataLen)\
+	name * decodeAsn1Object<name>(name * *pObject, const unsigned char** pData, long pDataLen)\
 	{\
 		return d2i_##name(pObject, pData, pDataLen);\
 	}\
@@ -154,7 +154,7 @@ static const int CB_ERROR = 0;
 #define DECLARE_ASN1_OBJECT(name)\
 	template<> name * newAsn1Object<name>();\
 	template<> int encodeAsn1Object<name>(name * pObject, unsigned char** encoded);\
-	template<> name * decodeAsn1Object<name>(name** pObject, const unsigned char** pData, long pDataLen);\
+	template<> name * decodeAsn1Object<name>(name * *pObject, const unsigned char** pData, long pDataLen);\
 	template<> void freeAsn1Object<name>(name * pObject);
 
 

src/card/base/asn1/ASN1Util.cpp

@@ -1,8 +1,8 @@
 #include "asn1/ASN1Util.h"
 
+#include <openssl/x509v3.h>
 #include <QDate>
 #include <QDebug>
-#include <openssl/x509v3.h>
 
 using namespace governikus;
 

src/card/base/asn1/CVCertificateChain.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "CVCertificate.h"
 #include "Commands.h"
+#include "CVCertificate.h"
 
 #include <QVector>
 

src/card/base/asn1/CVCertificateChainBuilder.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include "ChainBuilder.h"
 #include "CVCertificate.h"
 #include "CVCertificateChain.h"
-#include "ChainBuilder.h"
 #include "EstablishPACEChannel.h"
 
 

src/card/base/asn1/CertificateDescription.cpp

@@ -38,14 +38,14 @@ QStringList takeWhileNonEmpty(const QStringList& lines)
 
 QString getField(const QString& pData, const QStringList& pSearchItems, const QString& pDefaultValue)
 {
-	static const QString NEW_LINE("\r\n");
+	const QLatin1Char NEW_LINE('\n');
 
 	for (const auto& item : pSearchItems)
 	{
 		const int pos = pData.indexOf(item);
 		if (pos != -1)
 		{
-			const QString rest = pData.mid(pos + item.length());
+			const QString rest = pData.mid(pos + item.length()).trimmed();
 			const QStringList lines = takeWhileNonEmpty(rest.split(NEW_LINE));
 			if (lines.isEmpty())
 			{
@@ -243,7 +243,7 @@ QSet<QString> CertificateDescription::getCommCertificates() const
 QString CertificateDescription::getServiceProviderAddress() const
 {
 	static const QStringList SEARCH_ITEMS({
-		QStringLiteral("Name, Anschrift und E-Mail-Adresse des Diensteanbieters:\r\n")
+		QStringLiteral("Name, Anschrift und E-Mail-Adresse des Diensteanbieters:")
 	});
 
 	return getField(getTermsOfUsage(), SEARCH_ITEMS, QString());
@@ -253,10 +253,10 @@ QString CertificateDescription::getServiceProviderAddress() const
 QString CertificateDescription::getPurpose() const
 {
 	static const QStringList SEARCH_ITEMS({
-		QStringLiteral("Gesch\u00E4ftszweck:\r\n"),
-		QStringLiteral("Zweck des Auslesevorgangs:\r\n"),
-		QStringLiteral("Verwendung der Daten:\r\n"),
-		QStringLiteral("Zweck der Daten\u00FCbermittlung:\r\n")
+		QStringLiteral("Gesch\u00E4ftszweck:"),
+		QStringLiteral("Zweck des Auslesevorgangs:"),
+		QStringLiteral("Verwendung der Daten:"),
+		QStringLiteral("Zweck der Daten\u00FCbermittlung:")
 	});
 
 	return getField(getTermsOfUsage(), SEARCH_ITEMS, tr("see details under more..."));
@@ -267,7 +267,7 @@ QString CertificateDescription::getDataSecurityOfficer() const
 {
 	static const QStringList SEARCH_ITEMS({QStringLiteral(
 										   "Hinweis auf die f\u00FCr den Diensteanbieter zust\u00E4ndigen Stellen, "
-										   "die die Einhaltung der Vorschriften zum Datenschutz kontrollieren:\r\n")});
+										   "die die Einhaltung der Vorschriften zum Datenschutz kontrollieren:")});
 
 	return getField(getTermsOfUsage(), SEARCH_ITEMS, QString());
 }

src/card/base/asn1/CertificateDescription.h

@@ -40,9 +40,7 @@ namespace governikus
  *      redirectURL            [0x06] PrintableString OPTIONAL,
  *      commCertificates       [0x07] SET OF OCTET STRING OPTIONAL
  * }
- * \brief The CertificateDescription class
  */
-
 struct CertificateDescription
 {
 	Q_DECLARE_TR_FUNCTIONS(CertificateDescription)

src/card/base/asn1/ChainBuilder.h

@@ -13,9 +13,9 @@
 #pragma once
 
 
-#include <QVector>
 #include <algorithm>
 #include <functional>
+#include <QVector>
 
 
 namespace governikus

src/card/base/asn1/Chat.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "ASN1TemplateUtil.h"
 #include "AccessRoleAndRight.h"
+#include "ASN1TemplateUtil.h"
 
 #include <openssl/asn1t.h>
 

src/card/base/asn1/EcdsaPublicKey.cpp

@@ -7,8 +7,8 @@
 #include "EcdsaPublicKey.h"
 #include "pace/ec/EcUtil.h"
 
-#include <QLoggingCategory>
 #include <openssl/evp.h>
+#include <QLoggingCategory>
 
 
 using namespace governikus;

src/card/base/asn1/SecurityInfo.h

@@ -10,8 +10,8 @@
 
 #include "ASN1TemplateUtil.h"
 
-#include <QSharedPointer>
 #include <openssl/asn1.h>
+#include <QSharedPointer>
 
 
 namespace governikus

src/card/base/asn1/SignatureChecker.cpp

@@ -5,9 +5,9 @@
 #include "asn1/SignatureChecker.h"
 #include "pace/ec/EcUtil.h"
 
-#include <QLoggingCategory>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
+#include <QLoggingCategory>
 
 using namespace governikus;
 

src/card/base/command/BaseCardCommand.cpp

@@ -2,9 +2,9 @@
  * \copyright Copyright (c) 2015 Governikus GmbH & Co. KG
  */
 
+#include "asn1/SecurityInfos.h"
 #include "BaseCardCommand.h"
 #include "CardConnection.h"
-#include "asn1/SecurityInfos.h"
 
 #include <QLoggingCategory>
 #include <QSharedPointer>

src/card/base/command/BaseCardCommand.h

@@ -23,7 +23,7 @@ class BaseCardCommand
 	: public QObject
 {
 	Q_OBJECT
-	friend class::test_BaseCardCommand;
+	friend class ::test_BaseCardCommand;
 
 	private:
 		Q_INVOKABLE void execute(); // will be invoked by CardConnection

src/card/base/command/DidAuthenticateEAC1Command.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "asn1/Chat.h"
 #include "BaseCardCommand.h"
 #include "Commands.h"
-#include "asn1/Chat.h"
 
 namespace governikus
 {

src/card/base/command/DidAuthenticateEAC2Command.cpp

@@ -4,12 +4,12 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
+#include "asn1/ChipAuthenticationInfo.h"
+#include "asn1/EFCardSecurity.h"
 #include "CardConnection.h"
 #include "DidAuthenticateEAC2Command.h"
 #include "GeneralAuthenticateResponse.h"
 #include "ReturnCodeUtil.h"
-#include "asn1/ChipAuthenticationInfo.h"
-#include "asn1/EFCardSecurity.h"
 
 
 #include <QLoggingCategory>

src/card/base/command/DidAuthenticateEAC2Command.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "BaseCardCommand.h"
 #include "asn1/CVCertificateChain.h"
+#include "BaseCardCommand.h"
 
 namespace governikus
 {

src/card/base/pace/CipherMac.cpp

@@ -5,8 +5,8 @@
 #include "asn1/KnownOIDs.h"
 #include "pace/CipherMac.h"
 
-#include <QLoggingCategory>
 #include <openssl/evp.h>
+#include <QLoggingCategory>
 
 
 using namespace governikus;

src/card/base/pace/CipherMac.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QByteArray>
 #include <openssl/cmac.h>
+#include <QByteArray>
 
 namespace governikus
 {

src/card/base/pace/KeyAgreement.cpp

@@ -2,15 +2,15 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "Commands.h"
-#include "PersoSimWorkaround.h"
-#include "ReturnCodeUtil.h"
 #include "asn1/PACEInfo.h"
+#include "Commands.h"
 #include "pace/CipherMac.h"
+#include "pace/ec/EcdhKeyAgreement.h"
 #include "pace/KeyAgreement.h"
 #include "pace/KeyDerivationFunction.h"
 #include "pace/SymmetricCipher.h"
-#include "pace/ec/EcdhKeyAgreement.h"
+#include "PersoSimWorkaround.h"
+#include "ReturnCodeUtil.h"
 
 #include <QLoggingCategory>
 

src/card/base/pace/KeyAgreement.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "asn1/SecurityInfo.h"
 #include "CardConnectionWorker.h"
 #include "GeneralAuthenticateResponse.h"
-#include "asn1/SecurityInfo.h"
 #include "pace/KeyDerivationFunction.h"
 
 #include <QSharedPointer>

src/card/base/pace/KeyDerivationFunction.cpp

@@ -5,8 +5,8 @@
 #include "asn1/KnownOIDs.h"
 #include "pace/KeyDerivationFunction.h"
 
-#include <QLoggingCategory>
 #include <openssl/sha.h>
+#include <QLoggingCategory>
 
 
 using namespace governikus;

src/card/base/pace/PaceHandler.cpp

@@ -4,16 +4,16 @@
 
 #include "pace/PaceHandler.h"
 
-#include "Commands.h"
-#include "FileRef.h"
-#include "PersoSimWorkaround.h"
 #include "asn1/KnownOIDs.h"
 #include "asn1/PACEInfo.h"
-#include "pace/KeyAgreement.h"
+#include "Commands.h"
+#include "FileRef.h"
 #include "pace/ec/EllipticCurveFactory.h"
+#include "pace/KeyAgreement.h"
+#include "PersoSimWorkaround.h"
 
-#include <QLoggingCategory>
 #include <exception>
+#include <QLoggingCategory>
 
 using namespace governikus;
 

src/card/base/pace/PaceHandler.h

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "CardConnectionWorker.h"
-#include "EnumHelper.h"
 #include "asn1/PACEInfo.h"
 #include "asn1/SecurityInfos.h"
+#include "CardConnectionWorker.h"
+#include "EnumHelper.h"
 #include "pace/KeyAgreement.h"
 #include "pace/KeyDerivationFunction.h"
 
@@ -25,7 +25,7 @@ namespace governikus
 {
 class PaceHandler
 {
-	friend class::test_PaceHandler;
+	friend class ::test_PaceHandler;
 
 	private:
 		const QSharedPointer<CardConnectionWorker> mCardConnectionWorker;

src/card/base/pace/SecureMessaging.cpp

@@ -3,9 +3,9 @@
  *
  * \copyright Copyright (c) 2015 Governikus GmbH & Co. KG
  */
-#include "SecureMessagingResponse.h"
 #include "asn1/ASN1Util.h"
 #include "pace/SecureMessaging.h"
+#include "SecureMessagingResponse.h"
 
 #include <QLoggingCategory>
 

src/card/base/pace/SecureMessaging.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Apdu.h"
 #include "asn1/ASN1TemplateUtil.h"
+#include "Apdu.h"
 #include "pace/CipherMac.h"
 #include "pace/SymmetricCipher.h"
 

src/card/base/pace/SymmetricCipher.cpp

@@ -5,8 +5,8 @@
 #include "asn1/KnownOIDs.h"
 #include "pace/SymmetricCipher.h"
 
-#include <QLoggingCategory>
 #include <openssl/evp.h>
+#include <QLoggingCategory>
 
 
 using namespace governikus;

src/card/base/pace/SymmetricCipher.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QByteArray>
 #include <openssl/evp.h>
+#include <QByteArray>
 
 namespace governikus
 {

src/card/base/pace/ec/EcdhGenericMapping.cpp

@@ -4,8 +4,8 @@
 
 #include <openssl/ec.h>
 
-#include "pace/ec/EcUtil.h"
 #include "pace/ec/EcdhGenericMapping.h"
+#include "pace/ec/EcUtil.h"
 
 #include <QLoggingCategory>
 

src/card/base/pace/ec/EcdhGenericMapping.h

@@ -6,9 +6,9 @@
 
 #include "pace/DomainParameterMapping.h"
 
+#include <openssl/ec.h>
 #include <QByteArray>
 #include <QSharedPointer>
-#include <openssl/ec.h>
 
 namespace governikus
 {

src/card/base/pace/ec/EcdhKeyAgreement.cpp

@@ -2,13 +2,13 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "Commands.h"
 #include "asn1/KnownOIDs.h"
 #include "asn1/PACEInfo.h"
+#include "Commands.h"
 #include "pace/CipherMac.h"
-#include "pace/ec/EcUtil.h"
 #include "pace/ec/EcdhGenericMapping.h"
 #include "pace/ec/EcdhKeyAgreement.h"
+#include "pace/ec/EcUtil.h"
 #include "pace/ec/EllipticCurveFactory.h"
 
 #include <QLoggingCategory>

src/card/base/pace/ec/EcdhKeyAgreement.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "CardConnectionWorker.h"
 #include "asn1/SecurityInfo.h"
+#include "CardConnectionWorker.h"
 #include "pace/DomainParameterMapping.h"
 #include "pace/KeyAgreement.h"
 
-#include <QSharedPointer>
 #include <openssl/ec.h>
+#include <QSharedPointer>
 
 class test_EcdhKeyAgreement;
 
@@ -21,7 +21,7 @@ class EcdhKeyAgreement
 	: public KeyAgreement
 {
 	private:
-		friend class::test_EcdhKeyAgreement;
+		friend class ::test_EcdhKeyAgreement;
 
 		QSharedPointer<DomainParameterMapping<EC_GROUP> > mMapping;
 		QSharedPointer<EC_GROUP> mEphemeralCurve;

src/card/base/pace/ec/EllipticCurveFactory.h

@@ -6,9 +6,9 @@
 
 #include "asn1/SecurityInfo.h"
 
+#include <openssl/ec.h>
 #include <QByteArray>
 #include <QSharedPointer>
-#include <openssl/ec.h>
 
 namespace governikus
 {

src/card/bluetooth/BluetoothCard.cpp

@@ -5,11 +5,11 @@
  */
 #include "BluetoothCard.h"
 #include "DestroyPACEChannel.h"
-#include "SynchronousBtCall.h"
 #include "messages/BluetoothMessageCreator.h"
 #include "messages/BluetoothMessageDisconnectResponse.h"
 #include "messages/BluetoothMessageSetTransportProtocolResponse.h"
 #include "messages/BluetoothMessageTransferApduResponse.h"
+#include "SynchronousBtCall.h"
 
 
 #include <QLoggingCategory>

src/card/bluetooth/BluetoothReader.cpp

@@ -7,11 +7,11 @@
 #include "BluetoothCard.h"
 #include "BluetoothDebug.h"
 #include "BluetoothReader.h"
-#include "SynchronousBtCall.h"
 #include "messages/BluetoothMessageCreator.h"
 #include "messages/BluetoothMessageParser.h"
 #include "messages/BluetoothMessageSetTransportProtocolResponse.h"
 #include "messages/BluetoothMessageStatusInd.h"
+#include "SynchronousBtCall.h"
 
 #include <QDebug>
 #include <QLoggingCategory>

src/card/nfc/NFCConnector.java

@@ -10,9 +10,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.nfc.NfcAdapter;
+import android.nfc.tech.IsoDep;
 import android.nfc.Tag;
 import android.nfc.TagLostException;
-import android.nfc.tech.IsoDep;
 import android.util.Log;
 
 public class NFCConnector

src/card/nfc/NfcReaderManagerPlugIn.h

@@ -32,7 +32,7 @@ class NfcReaderManagerPlugIn
 	Q_INTERFACES(governikus::ReaderManagerPlugIn)
 
 #ifdef Q_OS_ANDROID
-	friend void::Java_com_governikus_ausweisapp2_NfcAdapterStateChangeReceiver_nfcAdapterStateChanged(JNIEnv * env, jobject obj, jint newState);
+	friend void ::Java_com_governikus_ausweisapp2_NfcAdapterStateChangeReceiver_nfcAdapterStateChanged(JNIEnv * env, jobject obj, jint newState);
 #endif
 
 	private:

src/cli/UIPlugInCli.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "ConsoleReader.h"
 #include "context/WorkflowContext.h"
+#include "ConsoleReader.h"
 #include "view/UIPlugIn.h"
 
 #include <QMap>

src/core/context/AuthContext.h

@@ -8,19 +8,14 @@
 
 #pragma once
 
+#include "asn1/Chat.h"
+#include "asn1/CVCertificate.h"
+#include "asn1/CVCertificateChainBuilder.h"
 #include "ActivationHandler.h"
+#include "context/WorkflowContext.h"
 #include "Commands.h"
 #include "EnumHelper.h"
 #include "NetworkManager.h"
-#include "Result.h"
-#include "SelfAuthenticationData.h"
-#include "TcToken.h"
-#include "UrlUtil.h"
-#include "asn1/CVCertificate.h"
-#include "asn1/CVCertificateChainBuilder.h"
-#include "asn1/Chat.h"
-#include "context/WorkflowContext.h"
-#include "paos/MessageIdHandler.h"
 #include "paos/invoke/DidAuthenticateResponseEac1.h"
 #include "paos/invoke/DidAuthenticateResponseEac2.h"
 #include "paos/invoke/DidListResponse.h"
@@ -28,6 +23,7 @@
 #include "paos/invoke/InitializeFrameworkResponse.h"
 #include "paos/invoke/StartPaos.h"
 #include "paos/invoke/TransmitResponse.h"
+#include "paos/MessageIdHandler.h"
 #include "paos/retrieve/DidAuthenticateEac1.h"
 #include "paos/retrieve/DidAuthenticateEac2.h"
 #include "paos/retrieve/DidAuthenticateEacAdditional.h"
@@ -35,6 +31,10 @@
 #include "paos/retrieve/InitializeFramework.h"
 #include "paos/retrieve/StartPaosResponse.h"
 #include "paos/retrieve/Transmit.h"
+#include "Result.h"
+#include "SelfAuthenticationData.h"
+#include "TcToken.h"
+#include "UrlUtil.h"
 
 #include <QDebug>
 #include <QPointer>
@@ -57,11 +57,11 @@ class AuthContext
 	Q_OBJECT
 
 	private:
-		friend class::test_StatePrepareChat;
-		friend class::test_StateRedirectBrowser;
-		friend class::test_StatePreVerification;
-		friend class::test_StateProcessCertificatesFromEac2;
-		friend class::test_StateCertificateDescriptionCheck;
+		friend class ::test_StatePrepareChat;
+		friend class ::test_StateRedirectBrowser;
+		friend class ::test_StatePreVerification;
+		friend class ::test_StateProcessCertificatesFromEac2;
+		friend class ::test_StateCertificateDescriptionCheck;
 
 		bool mTcTokenNotFound;
 		bool mErrorReportedToServer;

src/core/controller/AppController.cpp

@@ -5,6 +5,13 @@
  */
 
 #include "AppSettings.h"
+#include "context/AuthContext.h"
+#include "context/ChangePinContext.h"
+#include "context/SelfAuthenticationContext.h"
+#include "controller/AppController.h"
+#include "controller/AuthController.h"
+#include "controller/ChangePinController.h"
+#include "controller/SelfAuthController.h"
 #include "DriverService.h"
 #include "HttpServerRequestor.h"
 #include "HttpServerStatusParser.h"
@@ -14,13 +21,6 @@
 #include "ProviderService.h"
 #include "ReaderManager.h"
 #include "ResourceLoader.h"
-#include "context/AuthContext.h"
-#include "context/ChangePinContext.h"
-#include "context/SelfAuthenticationContext.h"
-#include "controller/AppController.h"
-#include "controller/AuthController.h"
-#include "controller/ChangePinController.h"
-#include "controller/SelfAuthController.h"
 #include "view/UILoader.h"
 
 #include <QCoreApplication>

src/core/controller/AppController.h

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "ActivationHandler.h"
-#include "EnumHelper.h"
 #include "context/WorkflowContext.h"
+#include "EnumHelper.h"
 #include "view/UIPlugIn.h"
 
 #include <QSharedPointer>

src/core/controller/AuthController.cpp

@@ -30,8 +30,8 @@
 #include "states/StateUpdateRetryCounter.h"
 #include "states/StateWriteHistory.h"
 
-#include <QDebug>
 #include <initializer_list>
+#include <QDebug>
 
 
 using namespace governikus;

src/core/controller/ChangePinController.cpp

@@ -2,8 +2,8 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "ChangePinController.h"
 #include "context/ChangePinContext.h"
+#include "ChangePinController.h"
 #include "states/CompositeStateSelectCard.h"
 #include "states/FinalState.h"
 #include "states/StateChangePin.h"

src/core/controller/SelfAuthController.cpp

@@ -31,8 +31,8 @@
 #include "states/StateWriteHistory.h"
 
 
-#include <QDebug>
 #include <initializer_list>
+#include <QDebug>
 
 
 using namespace governikus;

src/core/controller/WorkflowController.h

@@ -24,7 +24,7 @@ class WorkflowController
 	: public QObject
 {
 	Q_OBJECT
-	friend class::test_ChangePinController;
+	friend class ::test_ChangePinController;
 
 	protected:
 		QStateMachine mStateMachine;

src/core/paos/PaosMessage.h

@@ -17,7 +17,7 @@ namespace governikus
 
 class PaosMessage
 {
-	friend class::test_PaosMessage;
+	friend class ::test_PaosMessage;
 
 	private:
 		QString mMessageID, mRelatesTo;

src/core/paos/element/Eac1InputType.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include "asn1/AuthenticatedAuxiliaryData.h"
-#include "asn1/CVCertificate.h"
 #include "asn1/CertificateDescription.h"
 #include "asn1/Chat.h"
+#include "asn1/CVCertificate.h"
 
 #include <QByteArray>
 #include <QSharedPointer>
@@ -28,11 +28,11 @@ namespace governikus
 class Eac1InputType
 {
 	friend class DidAuthenticateEac1Parser;
-	friend class::test_StatePrepareChat;
-	friend class::test_StateExtractCvcsFromEac1InputType;
-	friend class::test_StatePreVerification;
-	friend class::test_StateCertificateDescriptionCheck;
-	friend class::test_StateProcessCertificatesFromEac2;
+	friend class ::test_StatePrepareChat;
+	friend class ::test_StateExtractCvcsFromEac1InputType;
+	friend class ::test_StatePreVerification;
+	friend class ::test_StateCertificateDescriptionCheck;
+	friend class ::test_StateProcessCertificatesFromEac2;
 
 	private:
 		QVector<QSharedPointer<CVCertificate> > mCvCertificates;

src/core/paos/element/Eac2InputType.h

@@ -19,7 +19,7 @@ namespace governikus
 class Eac2InputType
 {
 	friend class DidAuthenticateEac2Parser;
-	friend class::test_StateProcessCertificatesFromEac2;
+	friend class ::test_StateProcessCertificatesFromEac2;
 
 	private:
 		QByteArrayList mCvCertificatesAsBinary;

src/core/paos/invoke/DidAuthenticateResponseEac1.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include "EstablishPACEChannel.h"
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 #include <QByteArrayList>
 #include <QString>

src/core/paos/invoke/DidAuthenticateResponseEac2.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 #include <QString>
 

src/core/paos/invoke/DidListResponse.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 namespace governikus
 {

src/core/paos/invoke/DisconnectResponse.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 class test_DisconnectResponse;
 
@@ -18,7 +18,7 @@ class DisconnectResponse
 	: public PaosCreator
 	, public ResponseType
 {
-	friend class::test_DisconnectResponse;
+	friend class ::test_DisconnectResponse;
 
 	private:
 		QString mSlotHandle;

src/core/paos/invoke/InitializeFrameworkResponse.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "PaosCreator.h"
-#include "paos/ResponseType.h"
 #include "paos/element/SupportedApi.h"
+#include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 namespace governikus
 {

src/core/paos/invoke/PaosCreator.cpp

@@ -2,8 +2,8 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 #include <QDebug>
 #include <QUuid>

src/core/paos/invoke/PaosCreator.h

@@ -17,7 +17,7 @@ namespace governikus
 
 class PaosCreator
 {
-	friend class::test_PaosCreator;
+	friend class ::test_PaosCreator;
 
 	public:
 		enum class Namespace

src/core/paos/invoke/StartPaos.cpp

@@ -27,7 +27,7 @@ QDomElement StartPaos::createConnectionHandleElement()
 {
 	QDomElement element = mDoc.createElement(QStringLiteral("ConnectionHandle"));
 	element.setAttribute(getNamespacePrefix(Namespace::XSI), getNamespace(Namespace::XSI));
-	element.setAttribute(getNamespacePrefix(Namespace::XSI, QStringLiteral("type")), QStringLiteral("ConnectionHandle"));
+	element.setAttribute(getNamespacePrefix(Namespace::XSI, QStringLiteral("type")), QStringLiteral("ConnectionHandleType"));
 
 	element.appendChild(createTextElement(QStringLiteral("CardApplication"), QStringLiteral("e80704007f00070302")));
 	element.appendChild(createTextElement(QStringLiteral("SlotHandle"), QStringLiteral("00")));

src/core/paos/invoke/StartPaos.h

@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include "paos/PaosMessage.h"
 #include "paos/element/ConnectionHandle.h"
 #include "paos/element/SupportedApi.h"
 #include "paos/element/UserAgent.h"
 #include "paos/invoke/PaosCreator.h"
+#include "paos/PaosMessage.h"
 
 class test_StartPaos;
 
@@ -21,7 +21,7 @@ class StartPaos
 	: public PaosCreator
 	, public PaosMessage
 {
-	friend class::test_StartPaos;
+	friend class ::test_StartPaos;
 
 	private:
 		const QByteArray mSessionId;

src/core/paos/invoke/TransmitResponse.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "PaosCreator.h"
 #include "paos/ResponseType.h"
+#include "PaosCreator.h"
 
 class test_TransmitResponse;
 
@@ -18,7 +18,7 @@ class TransmitResponse
 	: public PaosCreator
 	, public ResponseType
 {
-	friend class::test_TransmitResponse;
+	friend class ::test_TransmitResponse;
 
 	private:
 		QByteArrayList mOutputApdus;

src/core/paos/retrieve/DidAuthenticateEac1.cpp

@@ -4,8 +4,8 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "DidAuthenticateEac1.h"
 #include "asn1/ASN1Util.h"
+#include "DidAuthenticateEac1.h"
 
 using namespace governikus;
 

src/core/paos/retrieve/DidAuthenticateEac1.h

@@ -8,13 +8,13 @@
 #pragma once
 
 #include "asn1/AuthenticatedAuxiliaryData.h"
-#include "asn1/CVCertificate.h"
 #include "asn1/CertificateDescription.h"
 #include "asn1/Chat.h"
-#include "paos/ElementDetector.h"
-#include "paos/PaosMessage.h"
+#include "asn1/CVCertificate.h"
 #include "paos/element/ConnectionHandle.h"
 #include "paos/element/Eac1InputType.h"
+#include "paos/ElementDetector.h"
+#include "paos/PaosMessage.h"
 
 #include <QVector>
 
@@ -31,11 +31,11 @@ class DIDAuthenticateEAC1
 	: public PaosMessage
 {
 	friend class DidAuthenticateEac1Parser;
-	friend class::test_StatePrepareChat;
-	friend class::test_StatePreVerification;
-	friend class::test_StateExtractCvcsFromEac1InputType;
-	friend class::test_StateProcessCertificatesFromEac2;
-	friend class::test_StateCertificateDescriptionCheck;
+	friend class ::test_StatePrepareChat;
+	friend class ::test_StatePreVerification;
+	friend class ::test_StateExtractCvcsFromEac1InputType;
+	friend class ::test_StateProcessCertificatesFromEac2;
+	friend class ::test_StateCertificateDescriptionCheck;
 
 	private:
 		ConnectionHandle mConnectionHandle;

src/core/paos/retrieve/DidAuthenticateEac2.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "paos/PaosMessage.h"
 #include "paos/element/ConnectionHandle.h"
 #include "paos/element/Eac2InputType.h"
+#include "paos/PaosMessage.h"
 
 class test_StateProcessCertificatesFromEac2;
 
@@ -21,7 +21,7 @@ class DIDAuthenticateEAC2
 	: public PaosMessage
 {
 	friend class DidAuthenticateEac2Parser;
-	friend class::test_StateProcessCertificatesFromEac2;
+	friend class ::test_StateProcessCertificatesFromEac2;
 
 	private:
 		ConnectionHandle mConnectionHandle;

src/core/paos/retrieve/DidAuthenticateEac2Parser.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "paos/PaosMessage.h"
 #include "paos/element/Eac2InputType.h"
+#include "paos/PaosMessage.h"
 #include "paos/retrieve/DidAuthenticateEac2.h"
 #include "paos/retrieve/PaosParser.h"
 

src/core/paos/retrieve/DidAuthenticateEacAdditional.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "paos/PaosMessage.h"
 #include "paos/element/ConnectionHandle.h"
+#include "paos/PaosMessage.h"
 
 #include <QString>
 

src/core/paos/retrieve/DidList.h

@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "paos/element/ConnectionHandle.h"
 #include "paos/ElementDetector.h"
 #include "paos/PaosMessage.h"
-#include "paos/element/ConnectionHandle.h"
 
 namespace governikus
 {

src/core/paos/retrieve/PaosParser.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "paos/PaosMessage.h"
 #include "paos/element/ElementParser.h"
+#include "paos/PaosMessage.h"
 
 namespace governikus
 {

src/core/states/AbstractState.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Result.h"
 #include "context/WorkflowContext.h"
+#include "Result.h"
 
 #include <QSharedPointer>
 #include <QState>

src/core/states/CompositeStateProcessCvcsAndSetRights.cpp

@@ -12,8 +12,8 @@
 #include "states/StateCheckCertificates.h"
 #include "states/StateEditAccessRights.h"
 #include "states/StateExtractCvcsFromEac1IntputType.h"
-#include "states/StatePreVerification.h"
 #include "states/StatePrepareChat.h"
+#include "states/StatePreVerification.h"
 
 
 using namespace governikus;

src/core/states/StateCertificateDescriptionCheck.cpp

@@ -4,10 +4,10 @@
 
 #include "StateCertificateDescriptionCheck.h"
 
-#include "AppSettings.h"
-#include "UrlUtil.h"
 #include "asn1/CVCertificateChainBuilder.h"
 #include "asn1/KnownOIDs.h"
+#include "AppSettings.h"
+#include "UrlUtil.h"
 
 
 using namespace governikus;

src/core/states/StateCertificateDescriptionCheck.h

@@ -17,7 +17,7 @@ class StateCertificateDescriptionCheck
 {
 	Q_OBJECT
 	friend class StateBuilder;
-	friend class::test_StateCertificateDescriptionCheck;
+	friend class ::test_StateCertificateDescriptionCheck;
 
 	StateCertificateDescriptionCheck(const QSharedPointer<WorkflowContext>& pContext);
 	virtual void run() override;

src/core/states/StateCheckRefreshAddress.h

@@ -28,7 +28,7 @@ class StateCheckRefreshAddress
 {
 	Q_OBJECT
 	friend class StateBuilder;
-	friend class::test_StateCheckRefreshAddress;
+	friend class ::test_StateCheckRefreshAddress;
 
 	StateCheckRefreshAddress(const QSharedPointer<WorkflowContext>& pContext);
 

src/core/states/StateDidAuthenticateEac1.cpp

@@ -4,11 +4,11 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
+#include "asn1/CVCertificateChainBuilder.h"
 #include "CardConnection.h"
 #include "Result.h"
 #include "ReturnCodeUtil.h"
 #include "StateDidAuthenticateEac1.h"
-#include "asn1/CVCertificateChainBuilder.h"
 
 #include <QMetaObject>
 

src/core/states/StateDidAuthenticateEac2.cpp

@@ -2,10 +2,10 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "CardConnection.h"
-#include "StateDidAuthenticateEac2.h"
 #include "asn1/CVCertificate.h"
 #include "asn1/CVCertificateChainBuilder.h"
+#include "CardConnection.h"
+#include "StateDidAuthenticateEac2.h"
 
 using namespace governikus;
 

src/core/states/StateDidList.cpp

@@ -4,8 +4,8 @@
  * \copyright Copyright (c) 2014 Governikus GmbH & Co. KG
  */
 
-#include "StateDidList.h"
 #include "paos/invoke/DidListResponse.h"
+#include "StateDidList.h"
 
 
 using namespace governikus;

src/core/states/StateEstablishPacePin.cpp

@@ -5,9 +5,9 @@
  */
 
 
+#include "context/AuthContext.h"
 #include "ReturnCodeUtil.h"
 #include "StateEstablishPacePin.h"
-#include "context/AuthContext.h"
 
 
 using namespace governikus;