Remove unused code

Signed-off-by: Raul Metsma <[email protected]>
open-eid · Jan 25, 2025 · 2f40cb0 · 2f40cb0
1 parent e681f36
commit 2f40cb0
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 155 deletions.
diff --git a/MoppApp/MoppApp/MobileIDChallengeViewController.swift b/MoppApp/MoppApp/MobileIDChallengeViewController.swift
@@ -33,7 +33,6 @@ class MobileIDChallengeViewController : UIViewController {
     @IBOutlet weak var helpLabel: UILabel!
 
     var challengeID = String()
-    var sessCode = String()
 
     var currentProgress: Double = 0.0
     var sessionTimer: Timer?
@@ -144,14 +143,12 @@ class MobileIDChallengeViewController : UIViewController {
 
     @objc func receiveMobileCreateSignatureNotification(_ notification: Notification) {
 
-        guard let response = notification.userInfo?[kCreateSignatureResponseKey] as? MoppLibMobileCreateSignatureResponse else {
+        guard let challengeID = notification.userInfo?[kCreateSignatureResponseKey] as? String else {
             return
         }
 
-        challengeID = response.challengeId!
-        sessCode = "\(Int(response.sessCode))"
         challengeIdNumbers = Array<Character>(challengeID)
-        
+
         let challengeIdAccessibilityLabel: NSAttributedString = NSAttributedString(string: "\(L(.signingProgress)) \(Int(0))%. \((L(LocKey.challengeCodeLabelAccessibility, [String(challengeIdNumbers[0]), String(challengeIdNumbers[1]), String(challengeIdNumbers[2]), String(challengeIdNumbers[3])]))). \(self.helpLabel.text!)", attributes: [.accessibilitySpeechQueueAnnouncement: true])
 
         codeLabel.text = L(LocKey.challengeCodeLabel, [challengeID])

diff --git a/MoppApp/MoppApp/MobileIDSignature.swift b/MoppApp/MoppApp/MobileIDSignature.swift
@@ -271,21 +271,18 @@ class MobileIDSignature {
 
     // MARK: Control / verification code setup
     private func setupControlCode() {
-        guard let verificationCode = self.getVerificationCode() else {
+        guard let dataToSign = MoppLibManager.getDataToSign(),
+            let verificationCode = ControlCode.shared.getVerificationCode(hash: dataToSign) else {
             printLog("\nRIA.MobileID - Failed to get verification code\n")
             return ErrorUtil.generateError(signingError: .generalError, details: MessageUtil.errorMessageWithDetails(details: "Failed to get verification code"))
         }
-        
+
         DispatchQueue.main.async {
-            let response: MoppLibMobileCreateSignatureResponse = MoppLibMobileCreateSignatureResponse()
-            response.challengeId = verificationCode
-            DispatchQueue.main.async {
-                NotificationCenter.default.post(
-                    name: .createSignatureNotificationName,
-                    object: nil,
-                    userInfo: [kCreateSignatureResponseKey: response]
-                )
-            }
+            NotificationCenter.default.post(
+                name: .createSignatureNotificationName,
+                object: nil,
+                userInfo: [kCreateSignatureResponseKey: verificationCode]
+            )
         }
     }
 
@@ -303,16 +300,7 @@ class MobileIDSignature {
 
         return hash
     }
-
-    // MARK: Get verification code
-    private func getVerificationCode() -> String? {
-        guard let dataToSign = MoppLibManager.getDataToSign(), let verificationCode: String = ControlCode.shared.getVerificationCode(hash: dataToSign) else {
-            ErrorUtil.generateError(signingError: .generalError, details: MessageUtil.errorMessageWithDetails(details: "Failed to get verification code"))
-            return nil
-        }
-        return verificationCode
-    }
-
+
     // MARK: Handle session status error
     private func handleSessionStatusError(sessionResultCode: SessionResultCode) -> SigningError {
         switch sessionResultCode {

diff --git a/MoppApp/MoppApp/MoppApp-Bridging-Header.h b/MoppApp/MoppApp/MoppApp-Bridging-Header.h
@@ -4,6 +4,5 @@
 
 #import <MoppLib/MoppLib.h>
 #import <MoppLib/MoppLibConstants.h>
-#import <MoppLib/MoppLibMobileCreateSignatureResponse.h>
 #import <MoppLib/MoppLibCardReaderManager.h>
 #import <MoppLib/MoppLibProxyConfiguration.h>
diff --git a/MoppLib/MoppLib.xcodeproj/project.pbxproj b/MoppLib/MoppLib.xcodeproj/project.pbxproj
@@ -47,8 +47,6 @@
 		54E085EB1E71A63C00431F1A /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E085E91E71A63C00431F1A /* Reachability.m */; };
 		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, ); }; };
-		AE0A844B1E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = AE0A84491E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.m */; };
 		C54EA73020499DFC0039AC78 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C54EA72F20499DFC0039AC78 /* ExternalAccessory.framework */; };
 		C54EA732204D5E860039AC78 /* CardReaderiR301.m in Sources */ = {isa = PBXBuildFile; fileRef = C54EA731204D5E860039AC78 /* CardReaderiR301.m */; };
 		C54EA734204D5EAA0039AC78 /* CardReaderiR301.h in Headers */ = {isa = PBXBuildFile; fileRef = C54EA733204D5EA70039AC78 /* CardReaderiR301.h */; };
@@ -76,8 +74,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, ); }; };
-		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 */; };
 		E42B08B51E1F0B3B00EA24A3 /* MoppLibContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = E42B08B31E1F0B3B00EA24A3 /* MoppLibContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E42B08B61E1F0B3B00EA24A3 /* MoppLibContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = E42B08B41E1F0B3B00EA24A3 /* MoppLibContainer.m */; };
@@ -151,14 +147,11 @@
 		54E085E91E71A63C00431F1A /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; 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>"; };
-		AE0A84491E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoppLibMobileCreateSignatureResponse.m; sourceTree = "<group>"; };
 		C54EA72F20499DFC0039AC78 /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; };
 		C54EA731204D5E860039AC78 /* CardReaderiR301.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CardReaderiR301.m; path = MoppLib/CardReaderiR301.m; sourceTree = SOURCE_ROOT; };
 		C54EA733204D5EA70039AC78 /* CardReaderiR301.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CardReaderiR301.h; sourceTree = "<group>"; };
 		C54EA735204D90D50039AC78 /* MoppLibCardReaderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibCardReaderManager.h; sourceTree = "<group>"; };
 		C54EA737204D91730039AC78 /* MoppLibCardReaderManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoppLibCardReaderManager.m; sourceTree = "<group>"; };
-		C55A20C321762448007BB191 /* mopplib.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = mopplib.modulemap; sourceTree = "<group>"; };
 		C5AAAF8120C9621D0087D6DA /* libiRockey301_ccid.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libiRockey301_ccid.a; sourceTree = "<group>"; };
 		C5AAAF8320CAA3D00087D6DA /* ReaderInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderInterface.h; sourceTree = "<group>"; };
 		C5AAAF8520CAA3F00087D6DA /* winscard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winscard.h; sourceTree = "<group>"; };
@@ -182,8 +175,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>"; };
-		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>"; };
 		E42B08B31E1F0B3B00EA24A3 /* MoppLibContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoppLibContainer.h; sourceTree = "<group>"; };
 		E42B08B41E1F0B3B00EA24A3 /* MoppLibContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoppLibContainer.m; sourceTree = "<group>"; };
@@ -218,8 +209,6 @@
 				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 */,
 				C5AAAF8220C9621D0087D6DA /* libiRockey301_ccid.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -277,8 +266,6 @@
 				E42B08C41E1F11B900EA24A3 /* MoppLibDataFile.m */,
 				E42B08C71E1F11C100EA24A3 /* MoppLibSignature.h */,
 				E42B08C81E1F11C100EA24A3 /* MoppLibSignature.m */,
-				AE0A84481E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.h */,
-				AE0A84491E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.m */,
 				DFF3C3A723322E0C0079458A /* MOPPLibConfiguration.h */,
 				DFF3C3A823322E0C0079458A /* MOPPLibConfiguration.m */,
 				DF1EE2BB234DD20500E37CA8 /* MoppLibCertificateInfo.h */,
@@ -340,8 +327,6 @@
 				C5F462A7209727E8001B7D59 /* CoreBluetooth.framework */,
 				C54EA72F20499DFC0039AC78 /* ExternalAccessory.framework */,
 				C5AAAF8120C9621D0087D6DA /* libiRockey301_ccid.a */,
-				E4250CFD1E096BEF00530370 /* libxml2.tbd */,
-				E4250CFB1E096BEA00530370 /* libz.tbd */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -421,7 +406,6 @@
 				540CB21F1E1CDCED00FE18A3 /* MoppLibCertificate.mm */,
 				E4250CFF1E096CAA00530370 /* test.bdoc */,
 				E4250CF21E096A0500530370 /* libdigidocpp */,
-				C55A20C321762448007BB191 /* mopplib.modulemap */,
 				DF169D592B9000F0000DD46C /* MoppLibDigidocValidateOnline.h */,
 				DF169D5B2B90011E000DD46C /* MoppLibDigidocValidateOnline.m */,
 			);
@@ -465,7 +449,6 @@
 				DFF3C3A923322E0D0079458A /* MOPPLibConfiguration.h in Headers */,
 				C54EA734204D5EAA0039AC78 /* CardReaderiR301.h in Headers */,
 				540CB2251E1CDD8100FE18A3 /* MoppLibCerificatetData.h in Headers */,
-				AE0A844A1E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.h in Headers */,
 				54DC0E011E0D48C900C62B3D /* MoppLibError.h in Headers */,
 				E4180C161E23FE9300FD7B8C /* MLDateFormatter.h in Headers */,
 				DF1EE2BD234DD20500E37CA8 /* MoppLibCertificateInfo.h in Headers */,
@@ -633,7 +616,6 @@
 				540CB2261E1CDD8100FE18A3 /* MoppLibCerificatetData.m in Sources */,
 				C5E41C5E2180602B00D79B54 /* Idemia.m in Sources */,
 				54DC0DFE1E0D196D00C62B3D /* CardActionsManager.m in Sources */,
-				AE0A844B1E43853800CC1465 /* MoppLibMobileCreateSignatureResponse.m in Sources */,
 				5463DA4D1E12927A008A1714 /* CardCommands.m in Sources */,
 				39266A5320CFC0F4002E3F23 /* SmartToken.m in Sources */,
 				542DCB6D1E23968000899534 /* MoppLibPinActions.m in Sources */,
@@ -870,6 +852,7 @@
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/lib",
 				);
+				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/include",
@@ -888,7 +871,6 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib",
 				);
-				MODULEMAP_FILE = MoppLib/mopplib.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.lab.MoppLib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -914,6 +896,7 @@
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/lib",
 				);
+				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DIGIDOCPP_PATH)/include",
@@ -932,7 +915,6 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoppLib/libdigidocpp/libdigidocpp.iphoneos/lib",
 				);
-				MODULEMAP_FILE = MoppLib/mopplib.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = mobi.lab.MoppLib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/MoppLib/MoppLib/Category/NSData+Additions.h b/MoppLib/MoppLib/Category/NSData+Additions.h
@@ -26,7 +26,6 @@
 @interface NSData (Additions)
 - (NSString *)hexString;
 - (NSData *)trailingTwoBytes;
-- (NSString *)codePage1252String;
 - (NSData *)trailingTwoBytesTrimmed;
 - (NSData *)utf8String;
 @end
diff --git a/MoppLib/MoppLib/Category/NSData+Additions.m b/MoppLib/MoppLib/Category/NSData+Additions.m
@@ -61,13 +61,6 @@ - (NSData *)trailingTwoBytesTrimmed {
   return  [self subdataWithRange:NSMakeRange(0, self.length - 2)];
 }
 
-- (NSString *)codePage1252String {
-  //Removing trailer
-  NSData *responseData = [self trailingTwoBytesTrimmed];
-  NSString *string = [[NSString alloc] initWithData:responseData encoding:NSWindowsCP1252StringEncoding];
-  return [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-}
-
 - (NSString *)utf8String {
     NSData *responseData = [self trailingTwoBytesTrimmed];
     NSString *string = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];

diff --git a/MoppLib/MoppLib/Info.plist b/MoppLib/MoppLib/Info.plist
@@ -2,28 +2,10 @@
 <!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>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-    <key>UISupportedExternalAccessoryProtocols</key>
-    <array>
-        <string>com.ftsafe.bR301</string>
-        <string>com.ftsafe.iR301</string>
-    </array>
+	<key>UISupportedExternalAccessoryProtocols</key>
+	<array>
+		<string>com.ftsafe.bR301</string>
+		<string>com.ftsafe.iR301</string>
+	</array>
 </dict>
 </plist>
diff --git a/MoppLib/MoppLib/MLFileManager.h b/MoppLib/MoppLib/MLFileManager.h
@@ -29,7 +29,6 @@
 
 - (NSString *)tslCachePath;
 - (NSArray *)getContainers;
-- (NSDictionary *)fileAttributes:(NSString *)filePath;
 - (BOOL)fileExistsAtPath:(NSString *)filePath;
 - (NSString *)cacheDirectoryPath;
 - (NSString *)logsDirectoryPath;

diff --git a/MoppLib/MoppLib/MLFileManager.m b/MoppLib/MoppLib/MLFileManager.m
@@ -88,12 +88,9 @@ - (NSArray *)getContainers {
   return containerPaths;
 }
 
-- (NSDictionary *)fileAttributes:(NSString *)filePath {
+- (NSDictionary<NSFileAttributeKey, id> *)fileAttributes:(NSString *)filePath {
   NSDictionary *fileAttributes = [self.fileManager attributesOfItemAtPath:filePath error:nil];
-  if (fileAttributes) {
-    return fileAttributes;
-  }
-  return nil;
+  return fileAttributes;
 }
 
 - (BOOL)fileExistsAtPath:(NSString *)filePath {

diff --git a/MoppLib/MoppLib/MoppLibDigidocManager.mm b/MoppLib/MoppLib/MoppLibDigidocManager.mm
@@ -483,7 +483,6 @@ - (MoppLibContainer *)getContainerWithPath:(NSString *)containerPath error:(NSEr
 
     [moppLibContainer setFileName:[containerPath lastPathComponent]];
     [moppLibContainer setFilePath:containerPath];
-    [moppLibContainer setFileAttributes:[[MLFileManager sharedInstance] fileAttributes:containerPath]];
 
     std::unique_ptr<digidoc::Container> doc;
     try {

diff --git a/MoppLib/MoppLib/PublicInterface/MoppLib.h b/MoppLib/MoppLib/PublicInterface/MoppLib.h
@@ -21,7 +21,7 @@
  *
  */
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for MoppLib.
 FOUNDATION_EXPORT double MoppLibVersionNumber;
@@ -41,7 +41,6 @@ FOUNDATION_EXPORT const unsigned char MoppLibVersionString[];
 #import <MoppLib/MoppLibContainer.h>
 #import <MoppLib/MoppLibDataFile.h>
 #import <MoppLib/MoppLibSignature.h>
-#import <MoppLib/MoppLibMobileCreateSignatureResponse.h>
 #import <MoppLib/MoppLibCardReaderManager.h>
 #import <MoppLib/MoppLibCertificateInfo.h>
 #import <MoppLib/MoppLibDigidocValidateOnline.h>
diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibConstants.h b/MoppLib/MoppLib/PublicInterface/MoppLibConstants.h
@@ -28,7 +28,6 @@
 #import "CryptoLib/CdocInfo.h"
 #import "MoppLibPersonalData.h"
 #import "MoppLibContainer.h"
-#import "MoppLibMobileCreateSignatureResponse.h"
 
 typedef NS_ENUM(NSUInteger, MoppLibCardChipType) {
     ChipType_Unknown,
@@ -98,7 +97,6 @@ typedef void (^ContainerBlock)(MoppLibContainer *container);
 typedef void (^LdapBlock)(NSMutableArray *ldapResponse);
 typedef void (^CdocContainerBlock)(CdocInfo *cdocInfo);
 typedef void (^DecryptedDataBlock)(NSMutableDictionary *decryptedData);
-typedef void (^MobileCreateSignatureResponseBlock)(MoppLibMobileCreateSignatureResponse *createSignatureResponse);
 typedef void (^VoidBlock)(void);
 typedef void (^BoolBlock)(BOOL);
 typedef void (^NumberBlock)(NSNumber*);

diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibContainer.h b/MoppLib/MoppLib/PublicInterface/MoppLibContainer.h
@@ -27,7 +27,6 @@
 
 @property (strong, nonatomic) NSString *fileName;
 @property (strong, nonatomic) NSString *filePath;
-@property (strong, nonatomic) NSDictionary *fileAttributes;
 @property (strong, nonatomic) NSArray *dataFiles;
 @property (strong, nonatomic) NSArray *signatures;
 @property (strong, nonatomic) NSArray *timestampTokens;

diff --git a/MoppLib/MoppLib/PublicInterface/MoppLibMobileCreateSignatureResponse.h b/MoppLib/MoppLib/PublicInterface/MoppLibMobileCreateSignatureResponse.h