IDEMIA 2018 v2

IB-8370, IB-8476

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

EstEIDToken/Info.plist

@@ -11,9 +11,9 @@
 				<string>A000000077010800070000FE00000100</string>
 			</array>
 			<key>com.apple.ctk.class-id</key>
-			<string>ee.ria.EstEIDTokenApp.EstEIDToken</string>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>com.apple.ctk.driver-class</key>
-			<string>EstEIDTokenDriver</string>
+			<string>$(PRODUCT_MODULE_NAME).EstEIDTokenDriver</string>
 			<key>com.apple.ctk.token-type</key>
 			<string>smartcard</string>
 		</dict>

EstEIDToken/Token.h

@@ -17,34 +17,14 @@
  *
  */
 
-#import <CryptoTokenKit/CryptoTokenKit.h>
 #import <CryptoTokenKit/TKSmartCardToken.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-#pragma mark EstEID implementation of TKToken classes
-
-#define NSDATA(LEN, ...) [NSData dataWithBytes:(const UInt8[]){__VA_ARGS__} length:LEN]
-
-static const TKTokenOperationConstraint EstEIDConstraintPIN = @"PIN";
-
-@interface EstEIDTokenDriver : TKSmartCardTokenDriver<TKSmartCardTokenDriverDelegate>
-+ (void)showNotification:(NSString*__nullable)msg;
-@end
-
-@interface Token : TKSmartCardToken<TKTokenDelegate>
-@end
-
-@interface IDEMIAToken : Token
-@end
-
 @interface TokenSession : TKSmartCardTokenSession<TKTokenSessionDelegate>
 @end
 
 @interface IDEMIATokenSession : TokenSession
 @end
 
-@interface AuthOperation : TKTokenSmartCardPINAuthOperation
-@end
-
 NS_ASSUME_NONNULL_END