diff --git a/MoppApp/MoppApp.xcodeproj/project.pbxproj b/MoppApp/MoppApp.xcodeproj/project.pbxproj
index c409bfd2e..ad8e131c2 100644
--- a/MoppApp/MoppApp.xcodeproj/project.pbxproj
+++ b/MoppApp/MoppApp.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
 		39CDA7EA20ADBCEC006E2E9F /* Crypto.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39CDA7E920ADBCEB006E2E9F /* Crypto.storyboard */; };
 		39CDA7EE20ADBE93006E2E9F /* CryptoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CDA7ED20ADBE93006E2E9F /* CryptoViewController.swift */; };
 		39F8EFE720D263B5001BCF73 /* TokenFlow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39F8EFE620D263B5001BCF73 /* TokenFlow.storyboard */; };
+		4E167D872B6D346F001B74A1 /* digidocpp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E167D862B6D346F001B74A1 /* digidocpp.framework */; };
+		4E167D882B6D346F001B74A1 /* digidocpp.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4E167D862B6D346F001B74A1 /* digidocpp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4E59080024B0F914001B23A6 /* SmartIDEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5907FF24B0F914001B23A6 /* SmartIDEditViewController.swift */; };
 		4E59080224B258C7001B23A6 /* SmartIDChallengeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E59080124B258C6001B23A6 /* SmartIDChallengeViewController.swift */; };
 		4E59080424B2E295001B23A6 /* SmartIDSignature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E59080324B2E295001B23A6 /* SmartIDSignature.swift */; };
@@ -336,6 +338,7 @@
 			files = (
 				E4250D071E0A911100530370 /* MoppLib.framework in Embed Frameworks */,
 				393B66E920DB9C19001DC89B /* CryptoLib.framework in Embed Frameworks */,
+				4E167D882B6D346F001B74A1 /* digidocpp.framework in Embed Frameworks */,
 				DF3D29D023F6B3CF007181B8 /* SkSigningLib.framework in Embed Frameworks */,
 				DF1503A92AC5D1DB007222B2 /* SwiftyRSA in Embed Frameworks */,
 				393B66E320DB94CD001DC89B /* cdoc.framework in Embed Frameworks */,
@@ -365,6 +368,7 @@
 		39CDA7E920ADBCEB006E2E9F /* Crypto.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Crypto.storyboard; sourceTree = "<group>"; };
 		39CDA7ED20ADBE93006E2E9F /* CryptoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoViewController.swift; sourceTree = "<group>"; };
 		39F8EFE620D263B5001BCF73 /* TokenFlow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TokenFlow.storyboard; sourceTree = "<group>"; };
+		4E167D862B6D346F001B74A1 /* digidocpp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = digidocpp.framework; path = "${DIGIDOCPP_PATH}/lib/digidocpp.framework"; sourceTree = "<absolute>"; };
 		4E5907FF24B0F914001B23A6 /* SmartIDEditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDEditViewController.swift; sourceTree = "<group>"; };
 		4E59080124B258C6001B23A6 /* SmartIDChallengeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDChallengeViewController.swift; sourceTree = "<group>"; };
 		4E59080324B2E295001B23A6 /* SmartIDSignature.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDSignature.swift; sourceTree = "<group>"; };
@@ -631,6 +635,7 @@
 			files = (
 				C55BB1CC2091BD2000618AC4 /* WebKit.framework in Frameworks */,
 				DF3D29CF23F6B3CF007181B8 /* SkSigningLib.framework in Frameworks */,
+				4E167D872B6D346F001B74A1 /* digidocpp.framework in Frameworks */,
 				DF1503A42AC5D163007222B2 /* ASN1Decoder in Frameworks */,
 				DF1503A62AC5D1B9007222B2 /* FirebaseCrashlytics in Frameworks */,
 				E4250D061E0A911100530370 /* MoppLib.framework in Frameworks */,
@@ -718,7 +723,6 @@
 				54A418341E83FB1100559E2B /* shareExtension.entitlements */,
 				54A418291E83FAD200559E2B /* MainInterface.storyboard */,
 				54A4182C1E83FAD200559E2B /* Info.plist */,
-				C51B7FB01FBB12E70046D6E0 /* shareExtension-Bridging-Header.h */,
 			);
 			path = shareExtension;
 			sourceTree = "<group>";
@@ -1223,6 +1227,7 @@
 				DF1503942AC5D011007222B2 /* CryptoLib.xcodeproj */,
 				DF1503882AC5CFFA007222B2 /* MoppLib.xcodeproj */,
 				393B66E120DB94CD001DC89B /* cdoc.framework */,
+				4E167D862B6D346F001B74A1 /* digidocpp.framework */,
 				DF13562F290201A100F61823 /* ExternalAccessory.framework */,
 				39852A6120AB2949004CB100 /* CryptoLib.framework */,
 				C55BB1CB2091BD2000618AC4 /* WebKit.framework */,
@@ -1823,11 +1828,7 @@
 				PROVISIONING_PROFILE = $SHARE_EXTENSION_PROVISIONING_PROFILE;
 				PROVISIONING_PROFILE_SPECIFIER = $SHARE_EXTENSION_PROVISIONING_PROFILE;
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "shareExtension/shareExtension-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Debug;
 		};
@@ -1856,10 +1857,7 @@
 				PROVISIONING_PROFILE = $SHARE_EXTENSION_PROVISIONING_PROFILE;
 				PROVISIONING_PROFILE_SPECIFIER = $SHARE_EXTENSION_PROVISIONING_PROFILE;
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "shareExtension/shareExtension-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Release;
 		};
@@ -1920,7 +1918,6 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1975,7 +1972,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1995,7 +1991,12 @@
 				DEFAULT_CENTRAL_CONFIGURATION_URL = "";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = ET847QJV9F;
-				ENABLE_BITCODE = NO;
+				DIGIDOCPP_PATH = "$(SRCROOT)/../MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos";
+				"DIGIDOCPP_PATH[sdk=iphonesimulator*]" = "$(SRCROOT)/../MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DIGIDOCPP_PATH)/lib",
+				);
 				GCC_PREFIX_HEADER = MoppApp/PrefixHeader.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@@ -2023,7 +2024,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Debug;
 		};
@@ -2041,7 +2041,12 @@
 				DEFAULT_CENTRAL_CONFIGURATION_URL = "";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = ET847QJV9F;
-				ENABLE_BITCODE = NO;
+				DIGIDOCPP_PATH = "$(SRCROOT)/../MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos";
+				"DIGIDOCPP_PATH[sdk=iphonesimulator*]" = "$(SRCROOT)/../MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DIGIDOCPP_PATH)/lib",
+				);
 				GCC_PREFIX_HEADER = MoppApp/PrefixHeader.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@@ -2068,7 +2073,6 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "MoppApp/MoppApp-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Release;
 		};
diff --git a/MoppApp/shareExtension/shareExtension-Bridging-Header.h b/MoppApp/shareExtension/shareExtension-Bridging-Header.h
deleted file mode 100644
index 1b2cb5d6d..000000000
--- a/MoppApp/shareExtension/shareExtension-Bridging-Header.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
diff --git a/MoppLib/MoppLib.xcodeproj/project.pbxproj b/MoppLib/MoppLib.xcodeproj/project.pbxproj
index 6855ab375..8e76b20ad 100644
--- a/MoppLib/MoppLib.xcodeproj/project.pbxproj
+++ b/MoppLib/MoppLib.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		399C01E320BC11C20056D7AC /* MoppLibCryptoActions.m in Sources */ = {isa = PBXBuildFile; fileRef = 399C01E220BC11C20056D7AC /* MoppLibCryptoActions.m */; };
 		399C01E620BC17A10056D7AC /* MoppLibCryptoActions.h in Headers */ = {isa = PBXBuildFile; fileRef = 399C01E120BC0EF30056D7AC /* MoppLibCryptoActions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		39DFDA6320C81F5D00D0D134 /* CryptoLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 399C01E420BC13320056D7AC /* CryptoLib.framework */; };
+		4E63A77B2AEA7C5A00CEE392 /* digidocpp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E63A77A2AEA7C5A00CEE392 /* digidocpp.framework */; };
 		540CB2201E1CDCED00FE18A3 /* MoppLibCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 540CB21E1E1CDCED00FE18A3 /* MoppLibCertificate.h */; };
 		540CB2211E1CDCED00FE18A3 /* MoppLibCertificate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 540CB21F1E1CDCED00FE18A3 /* MoppLibCertificate.mm */; };
 		540CB2251E1CDD8100FE18A3 /* MoppLibCerificatetData.h in Headers */ = {isa = PBXBuildFile; fileRef = 540CB2231E1CDD8100FE18A3 /* MoppLibCerificatetData.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -48,7 +49,6 @@
 		54DC0E021E0D48C900C62B3D /* MoppLibError.m in Sources */ = {isa = PBXBuildFile; fileRef = 54DC0E001E0D48C900C62B3D /* MoppLibError.m */; };
 		54E085EA1E71A63C00431F1A /* Reachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 54E085E81E71A63C00431F1A /* Reachability.h */; };
 		54E085EB1E71A63C00431F1A /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E085E91E71A63C00431F1A /* Reachability.m */; };
-		54E1DB571E44939D0060A250 /* SwiftTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E1DB561E44939D0060A250 /* SwiftTestCase.swift */; };
 		54E1DB5C1E44A9060060A250 /* MoppLibManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 54E1DB5A1E44A9060060A250 /* MoppLibManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		54E1DB5D1E44A9060060A250 /* MoppLibManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E1DB5B1E44A9060060A250 /* MoppLibManager.m */; };
 		AE0A844A1E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = AE0A84481E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -70,7 +70,6 @@
 		DF1503872AC5CE32007222B2 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = DF1503862AC5CE32007222B2 /* OCMock */; };
 		DF1EE2BD234DD20500E37CA8 /* MoppLibCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DF1EE2BB234DD20500E37CA8 /* MoppLibCertificateInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DF1EE2BE234DD20500E37CA8 /* MoppLibCertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF1EE2BC234DD20500E37CA8 /* MoppLibCertificateInfo.mm */; };
-		DF87E9CE292CC79500C2E3F4 /* libdigidocpp_util.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF87E9CD292CC77C00C2E3F4 /* libdigidocpp_util.a */; };
 		DFBDF1F827DA44BD00A5CF3C /* MoppLibRoleAddressData.h in Headers */ = {isa = PBXBuildFile; fileRef = DFBDF1F727DA44BD00A5CF3C /* MoppLibRoleAddressData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DFBDF1FA27DA44FD00A5CF3C /* MoppLibRoleAddressData.m in Sources */ = {isa = PBXBuildFile; fileRef = DFBDF1F927DA44FD00A5CF3C /* MoppLibRoleAddressData.m */; };
 		DFF3C3A923322E0D0079458A /* MOPPLibConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = DFF3C3A723322E0C0079458A /* MOPPLibConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -80,7 +79,6 @@
 		E4180C161E23FE9300FD7B8C /* MLDateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = E4180C141E23FE9300FD7B8C /* MLDateFormatter.h */; };
 		E4180C171E23FE9300FD7B8C /* MLDateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = E4180C151E23FE9300FD7B8C /* MLDateFormatter.m */; };
 		E4250CEC1E09695100530370 /* MoppLib.h in Headers */ = {isa = PBXBuildFile; fileRef = E4250CEA1E09695100530370 /* MoppLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E4250CF41E096A1D00530370 /* schema in Resources */ = {isa = PBXBuildFile; fileRef = E4250CF31E096A1D00530370 /* schema */; };
 		E4250CFC1E096BEA00530370 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E4250CFB1E096BEA00530370 /* libz.tbd */; };
 		E4250CFE1E096BEF00530370 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E4250CFD1E096BEF00530370 /* libxml2.tbd */; };
 		E4250D001E096CAA00530370 /* test.bdoc in Resources */ = {isa = PBXBuildFile; fileRef = E4250CFF1E096CAA00530370 /* test.bdoc */; };
@@ -115,6 +113,7 @@
 		399C01E120BC0EF30056D7AC /* MoppLibCryptoActions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoppLibCryptoActions.h; sourceTree = "<group>"; };
 		399C01E220BC11C20056D7AC /* MoppLibCryptoActions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoppLibCryptoActions.m; sourceTree = "<group>"; };
 		399C01E420BC13320056D7AC /* CryptoLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CryptoLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4E63A77A2AEA7C5A00CEE392 /* digidocpp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = digidocpp.framework; path = "$(DIGIDOCPP_PATH)/lib/digidocpp.framework"; sourceTree = "<absolute>"; };
 		540CB21E1E1CDCED00FE18A3 /* MoppLibCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibCertificate.h; sourceTree = "<group>"; };
 		540CB21F1E1CDCED00FE18A3 /* MoppLibCertificate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MoppLibCertificate.mm; sourceTree = "<group>"; };
 		540CB2231E1CDD8100FE18A3 /* MoppLibCerificatetData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibCerificatetData.h; sourceTree = "<group>"; };
@@ -157,8 +156,6 @@
 		54DC0E001E0D48C900C62B3D /* MoppLibError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoppLibError.m; sourceTree = "<group>"; };
 		54E085E81E71A63C00431F1A /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		54E085E91E71A63C00431F1A /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-		54E1DB551E44939C0060A250 /* MoppLibTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MoppLibTests-Bridging-Header.h"; sourceTree = "<group>"; };
-		54E1DB561E44939D0060A250 /* SwiftTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftTestCase.swift; sourceTree = "<group>"; };
 		54E1DB5A1E44A9060060A250 /* MoppLibManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibManager.h; sourceTree = "<group>"; };
 		54E1DB5B1E44A9060060A250 /* MoppLibManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoppLibManager.m; sourceTree = "<group>"; };
 		AE0A84481E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibMobileCreateSignatureResponse.h; sourceTree = "<group>"; };
@@ -180,7 +177,6 @@
 		C5F974D3217646CC00A167C7 /* TestEnvInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TestEnvInfo.plist; sourceTree = "<group>"; };
 		DF1EE2BB234DD20500E37CA8 /* MoppLibCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibCertificateInfo.h; sourceTree = "<group>"; };
 		DF1EE2BC234DD20500E37CA8 /* MoppLibCertificateInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MoppLibCertificateInfo.mm; sourceTree = "<group>"; };
-		DF87E9CD292CC77C00C2E3F4 /* libdigidocpp_util.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdigidocpp_util.a; path = MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_util.a; sourceTree = "<group>"; };
 		DFBDF1F727DA44BD00A5CF3C /* MoppLibRoleAddressData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoppLibRoleAddressData.h; sourceTree = "<group>"; };
 		DFBDF1F927DA44FD00A5CF3C /* MoppLibRoleAddressData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoppLibRoleAddressData.m; sourceTree = "<group>"; };
 		DFF3C3A723322E0C0079458A /* MOPPLibConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOPPLibConfiguration.h; sourceTree = "<group>"; };
@@ -192,7 +188,6 @@
 		E4250CE71E09695100530370 /* MoppLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoppLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E4250CEA1E09695100530370 /* MoppLib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoppLib.h; sourceTree = "<group>"; };
 		E4250CEB1E09695100530370 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E4250CF31E096A1D00530370 /* schema */ = {isa = PBXFileReference; lastKnownFileType = folder; name = schema; path = "$(DIGIDOCPP_PATH)/etc/digidocpp/schema"; sourceTree = "<group>"; };
 		E4250CFB1E096BEA00530370 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		E4250CFD1E096BEF00530370 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
 		E4250CFF1E096CAA00530370 /* test.bdoc */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.bdoc; sourceTree = "<group>"; };
@@ -226,8 +221,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				39DFDA6320C81F5D00D0D134 /* CryptoLib.framework in Frameworks */,
-				DF87E9CE292CC79500C2E3F4 /* libdigidocpp_util.a in Frameworks */,
 				C5F462A8209727E8001B7D59 /* CoreBluetooth.framework in Frameworks */,
+				4E63A77B2AEA7C5A00CEE392 /* digidocpp.framework in Frameworks */,
 				C54EA73020499DFC0039AC78 /* ExternalAccessory.framework in Frameworks */,
 				E4250CFE1E096BEF00530370 /* libxml2.tbd in Frameworks */,
 				E4250CFC1E096BEA00530370 /* libz.tbd in Frameworks */,
@@ -241,12 +236,10 @@
 		546E575F1E2E07C7009A568D /* MoppLibTests */ = {
 			isa = PBXGroup;
 			children = (
-				54E1DB561E44939D0060A250 /* SwiftTestCase.swift */,
 				546E57601E2E07C7009A568D /* PinVerificationTests.m */,
 				546E57621E2E07C7009A568D /* Info.plist */,
 				546E57691E2E1555009A568D /* MoppLibPinActions+Tests.h */,
 				546E576A1E2E1555009A568D /* MoppLibPinActions+Tests.m */,
-				54E1DB551E44939C0060A250 /* MoppLibTests-Bridging-Header.h */,
 			);
 			path = MoppLibTests;
 			sourceTree = "<group>";
@@ -350,7 +343,7 @@
 		A80A16CFB65AE0AF2A553445 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				DF87E9CD292CC77C00C2E3F4 /* libdigidocpp_util.a */,
+				4E63A77A2AEA7C5A00CEE392 /* digidocpp.framework */,
 				399C01E420BC13320056D7AC /* CryptoLib.framework */,
 				C5F462A7209727E8001B7D59 /* CoreBluetooth.framework */,
 				C54EA72F20499DFC0039AC78 /* ExternalAccessory.framework */,
@@ -448,7 +441,6 @@
 			isa = PBXGroup;
 			children = (
 				E43BD8191E3F901400F6C39D /* TSL cache */,
-				E4250CF31E096A1D00530370 /* schema */,
 			);
 			name = libdigidocpp;
 			sourceTree = "<group>";
@@ -612,7 +604,6 @@
 			files = (
 				C5F974D4217646CD00A167C7 /* TestEnvInfo.plist in Resources */,
 				E43BD81D1E3F901D00F6C39D /* EE.xml in Resources */,
-				E4250CF41E096A1D00530370 /* schema in Resources */,
 				E43BD81E1E3F901D00F6C39D /* FI.xml in Resources */,
 				E4250D001E096CAA00530370 /* test.bdoc in Resources */,
 				54D1FF731E4CB6AD006BF123 /* Localizable.strings in Resources */,
@@ -629,7 +620,6 @@
 			files = (
 				546E57611E2E07C7009A568D /* PinVerificationTests.m in Sources */,
 				546E576B1E2E1555009A568D /* MoppLibPinActions+Tests.m in Sources */,
-				54E1DB571E44939D0060A250 /* SwiftTestCase.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -719,9 +709,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.MoppLibTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "MoppLibTests/MoppLibTests-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -747,8 +734,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.MoppLibTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "MoppLibTests/MoppLibTests-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -814,7 +799,6 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -876,8 +860,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -890,7 +872,6 @@
 			buildSettings = {
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -899,7 +880,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DIGIDOCPP_PATH)/lib",
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/include",
@@ -914,36 +898,16 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(DIGIDOCPP_PATH)/lib",
 					"$(PROJECT_DIR)/MoppLib/bR301/lib",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib",
 				);
 				MODULEMAP_FILE = MoppLib/mopplib.modulemap;
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-ObjC",
-					"-ldigidocpp_priv",
-					"-ldigidocpp",
-					"-lssl",
-					"-lxalan-c",
-					"-lcrypto",
-					"-lxml-security-c",
-					"-lxerces-c",
-					"-lminizip",
-					"-lxalanMsg",
-					"-lxml2",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.lab.MoppLib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
-				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Debug;
 		};
@@ -952,8 +916,6 @@
 			buildSettings = {
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -962,7 +924,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DIGIDOCPP_PATH)/lib",
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/include",
@@ -977,35 +942,16 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(DIGIDOCPP_PATH)/lib",
 					"$(PROJECT_DIR)/MoppLib/bR301/lib",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib",
 				);
 				MODULEMAP_FILE = MoppLib/mopplib.modulemap;
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-ObjC",
-					"-ldigidocpp_priv",
-					"-ldigidocpp",
-					"-lssl",
-					"-lxalan-c",
-					"-lcrypto",
-					"-lxml-security-c",
-					"-lxerces-c",
-					"-lminizip",
-					"-lxalanMsg",
-					"-lxml2",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.lab.MoppLib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
-				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Release;
 		};
diff --git a/MoppLib/MoppLib/MoppLibDigidocManager.mm b/MoppLib/MoppLib/MoppLibDigidocManager.mm
index b07cd103f..e783a75d7 100644
--- a/MoppLib/MoppLib/MoppLibDigidocManager.mm
+++ b/MoppLib/MoppLib/MoppLibDigidocManager.mm
@@ -70,12 +70,6 @@
     return tslCachePath.UTF8String;
   }
 
-  std::string xsdPath() const override {
-    NSBundle *bundle = [NSBundle bundleForClass:[MoppLibDigidocManager class]];
-    NSString *path = [bundle pathForResource:@"schema" ofType:@""];
-    return path.UTF8String;
-  }
-
   std::string TSUrl() const override {
       NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
       NSString *tsaUrl = [defaults stringForKey:@"kTimestampUrlKey"];
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/bio.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/bio.h
index e16cf622c..f9aa74731 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/bio.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/bio.h
@@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom,
                       int (*puts) (BIO *, const char *));
 int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int);
 int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*gets) (BIO *, char *, int));
+                      int (*ossl_gets) (BIO *, char *, int));
 long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *);
 int BIO_meth_set_ctrl(BIO_METHOD *biom,
                       long (*ctrl) (BIO *, int, long, void *));
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/cmserr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/cmserr.h
index d48c2a4ab..f2d7708f1 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/cmserr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/cmserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -113,6 +113,7 @@
 #  define CMS_R_UNSUPPORTED_LABEL_SOURCE                   193
 #  define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE             155
 #  define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
+#  define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM            195
 #  define CMS_R_UNSUPPORTED_TYPE                           156
 #  define CMS_R_UNWRAP_ERROR                               157
 #  define CMS_R_UNWRAP_FAILURE                             180
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/conferr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/conferr.h
index 496e2e1ef..5dd4868ab 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/conferr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/conferr.h
@@ -38,6 +38,7 @@
 # define CONF_R_NUMBER_TOO_LARGE                          121
 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION   124
 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE               111
+# define CONF_R_RECURSIVE_SECTION_REFERENCE               126
 # define CONF_R_RELATIVE_PATH                             125
 # define CONF_R_SSL_COMMAND_SECTION_EMPTY                 117
 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND             118
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dh.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dh.h
index 6533260f2..50e0cf54b 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dh.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dh.h
@@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams)
 #   define DH_GENERATOR_3          3
 #   define DH_GENERATOR_5          5
 
-/* DH_check error codes */
+/* DH_check error codes, some of them shared with DH_check_pub_key */
 /*
  * NB: These values must align with the equivalently named macros in
  * internal/ffc.h.
@@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams)
 #   define DH_UNABLE_TO_CHECK_GENERATOR    0x04
 #   define DH_NOT_SUITABLE_GENERATOR       0x08
 #   define DH_CHECK_Q_NOT_PRIME            0x10
-#   define DH_CHECK_INVALID_Q_VALUE        0x20
+#   define DH_CHECK_INVALID_Q_VALUE        0x20 /* +DH_check_pub_key */
 #   define DH_CHECK_INVALID_J_VALUE        0x40
 #   define DH_MODULUS_TOO_SMALL            0x80
-#   define DH_MODULUS_TOO_LARGE            0x100
+#   define DH_MODULUS_TOO_LARGE            0x100 /* +DH_check_pub_key */
 
 /* DH_check_pub_key error codes */
 #   define DH_CHECK_PUBKEY_TOO_SMALL       0x01
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dherr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dherr.h
index 5d2a762a9..074a70145 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dherr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/dherr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -50,6 +50,7 @@
 #  define DH_R_NO_PRIVATE_VALUE                            100
 #  define DH_R_PARAMETER_ENCODING_ERROR                    105
 #  define DH_R_PEER_KEY_ERROR                              111
+#  define DH_R_Q_TOO_LARGE                                 130
 #  define DH_R_SHARED_INFO_ERROR                           113
 #  define DH_R_UNABLE_TO_CHECK_GENERATOR                   121
 
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/evp.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/evp.h
index 49e8e1df7..e64072f96 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/evp.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -85,6 +85,8 @@
 /* Easy to use macros for EVP_PKEY related selections */
 # define EVP_PKEY_KEY_PARAMETERS                                            \
     ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS )
+# define EVP_PKEY_PRIVATE_KEY                                               \
+    ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PRIVATE_KEY )
 # define EVP_PKEY_PUBLIC_KEY                                                \
     ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PUBLIC_KEY )
 # define EVP_PKEY_KEYPAIR                                                   \
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/opensslv.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/opensslv.h
index 0bf61ce6a..012d77ee8 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/opensslv.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  0
-# define OPENSSL_VERSION_PATCH  11
+# define OPENSSL_VERSION_PATCH  13
 
 /*
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
-# define OPENSSL_VERSION_STR "3.0.11"
-# define OPENSSL_FULL_VERSION_STR "3.0.11"
+# define OPENSSL_VERSION_STR "3.0.13"
+# define OPENSSL_FULL_VERSION_STR "3.0.13"
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
-# define OPENSSL_RELEASE_DATE "19 Sep 2023"
+# define OPENSSL_RELEASE_DATE "30 Jan 2024"
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.11 19 Sep 2023"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024"
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/pkcs7.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/pkcs7.h
index 557a0a726..0ce79bf4f 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/pkcs7.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/openssl/pkcs7.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from include/openssl/pkcs7.h.in
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st {
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *digest_alg;
     STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
+    X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */
+    ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */
     STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
     /* The private key to sign with */
     EVP_PKEY *pkey;
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Conf.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Conf.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Conf.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Conf.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Container.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Container.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Container.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Container.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/DataFile.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/DataFile.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/DataFile.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/DataFile.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Exception.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Exception.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Exception.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Exception.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Exports.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Exports.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Exports.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Exports.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Signature.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Signature.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/Signature.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/Signature.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/XmlConf.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/XmlConf.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/XmlConf.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/XmlConf.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/PKCS11Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/PKCS11Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/PKCS11Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/PKCS11Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/PKCS12Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/PKCS12Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/PKCS12Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/PKCS12Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/X509Cert.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/X509Cert.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/include/digidocpp/crypto/X509Cert.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Headers/crypto/X509Cert.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Info.plist b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Info.plist
new file mode 100644
index 000000000..29167011b
--- /dev/null
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>digidocpp</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>ee.ria.digidocpp</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>3.17.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1417</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>13.0</string>
+</dict>
+</plist>
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp
old mode 100644
new mode 100755
similarity index 53%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp.a
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp
index 8c1045091..4cab8493c
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/digidocpp.conf b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp.conf
similarity index 94%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/digidocpp.conf
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp.conf
index 40e0dd7ca..bdce2188c 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/digidocpp.conf
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/digidocpp.conf
@@ -10,7 +10,7 @@
     <!--<param name="signer.signatureDigestUri" lock="false">http://www.w3.org/2001/04/xmlenc#sha256</param>-->
 
     <!--PKCS#11 driver’s location, if not using default driver-->
-    <!--<param name="pkcs11.driver.path" lock="false">/Library/OpenSC/lib/opensc-pkcs11.so</param>-->
+    <!--<param name="pkcs11.driver.path" lock="false">/usr/local/lib/opensc-pkcs11.so</param>-->
 
     <!--HTTP proxy settings, if needed-->
     <!--<param name="proxy.forceSSL" lock="false">false</param>-->
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_dsig.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_dsig.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_dsig.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_dsig.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_manifest.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_manifest.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_manifest.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_manifest.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_manifest_v1_2.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_manifest_v1_2.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/OpenDocument_manifest_v1_2.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/OpenDocument_manifest_v1_2.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v132-201601-relaxed.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v132-201601-relaxed.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v132-201601-relaxed.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v132-201601-relaxed.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v132-201601.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v132-201601.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v132-201601.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v132-201601.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v141-201601.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v141-201601.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/XAdES01903v141-201601.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/XAdES01903v141-201601.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/conf.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/conf.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/conf.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/conf.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/en_31916201v010101.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/en_31916201v010101.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/en_31916201v010101.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/en_31916201v010101.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020101_additionaltypes_xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020101_additionaltypes_xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020101_additionaltypes_xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020101_additionaltypes_xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020101_sie_xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020101_sie_xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020101_sie_xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020101_sie_xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020201_201601xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020201_201601xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/ts_119612v020201_201601xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/ts_119612v020201_201601xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/xml.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/xml.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/xml.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/xml.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/xmldsig-core-schema.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/xmldsig-core-schema.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/schema/xmldsig-core-schema.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/digidocpp.framework/schema/xmldsig-core-schema.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libcrypto.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libcrypto.a
index 85f27aa01..49a0003fd 100644
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libcrypto.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libcrypto.a differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp.a
deleted file mode 100644
index b0260fbb6..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_priv.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_priv.a
deleted file mode 100644
index 44ea75694..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_priv.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_util.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_util.a
deleted file mode 100644
index ef6121bf5..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libdigidocpp_util.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libminizip.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libminizip.a
deleted file mode 100644
index 4875171a5..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libminizip.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libssl.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libssl.a
index 19a47e309..8c5a0827c 100644
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libssl.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libssl.a differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalan-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalan-c.a
deleted file mode 100644
index e23c61c87..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalan-c.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalanMsg.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalanMsg.a
deleted file mode 100644
index 9f75a9709..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxalanMsg.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxerces-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxerces-c.a
deleted file mode 100644
index d7f6282fe..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxerces-c.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxml-security-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxml-security-c.a
deleted file mode 100644
index 582a15d93..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib/libxml-security-c.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/bio.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/bio.h
index e16cf622c..f9aa74731 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/bio.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/bio.h
@@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom,
                       int (*puts) (BIO *, const char *));
 int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int);
 int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*gets) (BIO *, char *, int));
+                      int (*ossl_gets) (BIO *, char *, int));
 long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *);
 int BIO_meth_set_ctrl(BIO_METHOD *biom,
                       long (*ctrl) (BIO *, int, long, void *));
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/cmserr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/cmserr.h
index d48c2a4ab..f2d7708f1 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/cmserr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/cmserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -113,6 +113,7 @@
 #  define CMS_R_UNSUPPORTED_LABEL_SOURCE                   193
 #  define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE             155
 #  define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
+#  define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM            195
 #  define CMS_R_UNSUPPORTED_TYPE                           156
 #  define CMS_R_UNWRAP_ERROR                               157
 #  define CMS_R_UNWRAP_FAILURE                             180
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/conferr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/conferr.h
index 496e2e1ef..5dd4868ab 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/conferr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/conferr.h
@@ -38,6 +38,7 @@
 # define CONF_R_NUMBER_TOO_LARGE                          121
 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION   124
 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE               111
+# define CONF_R_RECURSIVE_SECTION_REFERENCE               126
 # define CONF_R_RELATIVE_PATH                             125
 # define CONF_R_SSL_COMMAND_SECTION_EMPTY                 117
 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND             118
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/configuration.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/configuration.h
index f56cfb791..49b5ffb7e 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/configuration.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/configuration.h
@@ -46,6 +46,9 @@ extern "C" {
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_ASYNC
 #  define OPENSSL_NO_ASYNC
 # endif
@@ -142,11 +145,11 @@ extern "C" {
  * The following are cipher-specific, but are part of the public API.
  */
 # if !defined(OPENSSL_SYS_UEFI)
-#  undef BN_LLONG
+#  define BN_LLONG
 /* Only one for the following should be defined */
-#  define SIXTY_FOUR_BIT_LONG
+#  undef SIXTY_FOUR_BIT_LONG
 #  undef SIXTY_FOUR_BIT
-#  undef THIRTY_TWO_BIT
+#  define THIRTY_TWO_BIT
 # endif
 
 # define RC4_INT unsigned char
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dh.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dh.h
index 6533260f2..50e0cf54b 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dh.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dh.h
@@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams)
 #   define DH_GENERATOR_3          3
 #   define DH_GENERATOR_5          5
 
-/* DH_check error codes */
+/* DH_check error codes, some of them shared with DH_check_pub_key */
 /*
  * NB: These values must align with the equivalently named macros in
  * internal/ffc.h.
@@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams)
 #   define DH_UNABLE_TO_CHECK_GENERATOR    0x04
 #   define DH_NOT_SUITABLE_GENERATOR       0x08
 #   define DH_CHECK_Q_NOT_PRIME            0x10
-#   define DH_CHECK_INVALID_Q_VALUE        0x20
+#   define DH_CHECK_INVALID_Q_VALUE        0x20 /* +DH_check_pub_key */
 #   define DH_CHECK_INVALID_J_VALUE        0x40
 #   define DH_MODULUS_TOO_SMALL            0x80
-#   define DH_MODULUS_TOO_LARGE            0x100
+#   define DH_MODULUS_TOO_LARGE            0x100 /* +DH_check_pub_key */
 
 /* DH_check_pub_key error codes */
 #   define DH_CHECK_PUBKEY_TOO_SMALL       0x01
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dherr.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dherr.h
index 5d2a762a9..074a70145 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dherr.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/dherr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -50,6 +50,7 @@
 #  define DH_R_NO_PRIVATE_VALUE                            100
 #  define DH_R_PARAMETER_ENCODING_ERROR                    105
 #  define DH_R_PEER_KEY_ERROR                              111
+#  define DH_R_Q_TOO_LARGE                                 130
 #  define DH_R_SHARED_INFO_ERROR                           113
 #  define DH_R_UNABLE_TO_CHECK_GENERATOR                   121
 
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/evp.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/evp.h
index 49e8e1df7..e64072f96 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/evp.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -85,6 +85,8 @@
 /* Easy to use macros for EVP_PKEY related selections */
 # define EVP_PKEY_KEY_PARAMETERS                                            \
     ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS )
+# define EVP_PKEY_PRIVATE_KEY                                               \
+    ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PRIVATE_KEY )
 # define EVP_PKEY_PUBLIC_KEY                                                \
     ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PUBLIC_KEY )
 # define EVP_PKEY_KEYPAIR                                                   \
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/opensslv.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/opensslv.h
index 0bf61ce6a..012d77ee8 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/opensslv.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  0
-# define OPENSSL_VERSION_PATCH  11
+# define OPENSSL_VERSION_PATCH  13
 
 /*
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
-# define OPENSSL_VERSION_STR "3.0.11"
-# define OPENSSL_FULL_VERSION_STR "3.0.11"
+# define OPENSSL_VERSION_STR "3.0.13"
+# define OPENSSL_FULL_VERSION_STR "3.0.13"
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
-# define OPENSSL_RELEASE_DATE "19 Sep 2023"
+# define OPENSSL_RELEASE_DATE "30 Jan 2024"
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.11 19 Sep 2023"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 30 Jan 2024"
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/pkcs7.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/pkcs7.h
index 557a0a726..0ce79bf4f 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/pkcs7.h
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/openssl/pkcs7.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from include/openssl/pkcs7.h.in
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -56,8 +56,8 @@ typedef struct pkcs7_signer_info_st {
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *digest_alg;
     STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
+    X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */
+    ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */
     STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
     /* The private key to sign with */
     EVP_PKEY *pkey;
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Conf.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Conf.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Conf.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Conf.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Container.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Container.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Container.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Container.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/DataFile.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/DataFile.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/DataFile.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/DataFile.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Exception.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Exception.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Exception.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Exception.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Exports.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Exports.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Exports.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Exports.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Signature.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Signature.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/Signature.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/Signature.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/XmlConf.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/XmlConf.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/XmlConf.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/XmlConf.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/PKCS11Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/PKCS11Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/PKCS11Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/PKCS11Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/PKCS12Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/PKCS12Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/PKCS12Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/PKCS12Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/Signer.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/Signer.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/Signer.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/Signer.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/X509Cert.h b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/X509Cert.h
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/include/digidocpp/crypto/X509Cert.h
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Headers/crypto/X509Cert.h
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Info.plist b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Info.plist
new file mode 100644
index 000000000..29167011b
--- /dev/null
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>digidocpp</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>ee.ria.digidocpp</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>3.17.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1417</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>13.0</string>
+</dict>
+</plist>
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_priv.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp
old mode 100644
new mode 100755
similarity index 67%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_priv.a
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp
index d296c51b5..46ac1bccb
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_priv.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/digidocpp.conf b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp.conf
similarity index 94%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/digidocpp.conf
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp.conf
index 40e0dd7ca..bdce2188c 100644
--- a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphoneos/etc/digidocpp/digidocpp.conf
+++ b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/digidocpp.conf
@@ -10,7 +10,7 @@
     <!--<param name="signer.signatureDigestUri" lock="false">http://www.w3.org/2001/04/xmlenc#sha256</param>-->
 
     <!--PKCS#11 driver’s location, if not using default driver-->
-    <!--<param name="pkcs11.driver.path" lock="false">/Library/OpenSC/lib/opensc-pkcs11.so</param>-->
+    <!--<param name="pkcs11.driver.path" lock="false">/usr/local/lib/opensc-pkcs11.so</param>-->
 
     <!--HTTP proxy settings, if needed-->
     <!--<param name="proxy.forceSSL" lock="false">false</param>-->
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_dsig.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_dsig.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_dsig.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_dsig.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_manifest.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_manifest.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_manifest.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_manifest.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_manifest_v1_2.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_manifest_v1_2.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/OpenDocument_manifest_v1_2.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/OpenDocument_manifest_v1_2.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v132-201601-relaxed.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v132-201601-relaxed.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v132-201601-relaxed.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v132-201601-relaxed.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v132-201601.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v132-201601.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v132-201601.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v132-201601.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v141-201601.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v141-201601.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/XAdES01903v141-201601.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/XAdES01903v141-201601.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/conf.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/conf.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/conf.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/conf.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/en_31916201v010101.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/en_31916201v010101.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/en_31916201v010101.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/en_31916201v010101.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020101_additionaltypes_xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020101_additionaltypes_xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020101_additionaltypes_xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020101_additionaltypes_xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020101_sie_xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020101_sie_xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020101_sie_xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020101_sie_xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020201_201601xsd.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020201_201601xsd.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/ts_119612v020201_201601xsd.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/ts_119612v020201_201601xsd.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/xml.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/xml.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/xml.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/xml.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/xmldsig-core-schema.xsd b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/xmldsig-core-schema.xsd
similarity index 100%
rename from MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/etc/digidocpp/schema/xmldsig-core-schema.xsd
rename to MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/digidocpp.framework/schema/xmldsig-core-schema.xsd
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libcrypto.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libcrypto.a
index 85f27aa01..0768dc43a 100644
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libcrypto.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libcrypto.a differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_util.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_util.a
deleted file mode 100644
index 50b7c12f5..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libdigidocpp_util.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libminizip.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libminizip.a
deleted file mode 100644
index 7b9d2f33e..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libminizip.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libssl.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libssl.a
index 19a47e309..023d976c1 100644
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libssl.a and b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libssl.a differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalan-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalan-c.a
deleted file mode 100644
index e23c61c87..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalan-c.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalanMsg.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalanMsg.a
deleted file mode 100644
index 9f75a9709..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxalanMsg.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxerces-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxerces-c.a
deleted file mode 100644
index d7f6282fe..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxerces-c.a and /dev/null differ
diff --git a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxml-security-c.a b/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxml-security-c.a
deleted file mode 100644
index 582a15d93..000000000
Binary files a/MoppLib/MoppLib/libdigidocpp/libdigidocpp.iphonesimulator/lib/libxml-security-c.a and /dev/null differ
diff --git a/MoppLib/MoppLibTests/MoppLibTests-Bridging-Header.h b/MoppLib/MoppLibTests/MoppLibTests-Bridging-Header.h
deleted file mode 100644
index 1b2cb5d6d..000000000
--- a/MoppLib/MoppLibTests/MoppLibTests-Bridging-Header.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
diff --git a/MoppLib/MoppLibTests/SwiftTestCase.swift b/MoppLib/MoppLibTests/SwiftTestCase.swift
deleted file mode 100644
index f3cc2c5dd..000000000
--- a/MoppLib/MoppLibTests/SwiftTestCase.swift
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  SwiftTestCase.swift
-//  MoppLib
-//
-/*
- * Copyright 2017 - 2023 Riigi Infosüsteemi Amet
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-import XCTest
-
-class SwiftTestCase: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}