diff --git a/EstEIDToken/Token.m b/EstEIDToken/Token.m index 47605d1..092c54c 100644 --- a/EstEIDToken/Token.m +++ b/EstEIDToken/Token.m @@ -136,13 +136,6 @@ - (BOOL)populateIdentity:(NSMutableArray *)items smartcar } [keyItem setName:keyName]; -#if ENABLE_RSA == 0 - if ([keyItem.keyType isEqual:(id)kSecAttrKeyTypeRSA]) { - NSLog(@"EstEIDToken populateIdentityFromSmartCard: RSA support is disabled"); - return NO; - } -#endif - keyItem.canSign = YES; keyItem.canDecrypt = NO; //auth; FIXME: implement decryption keyItem.suitableForLogin = NO; //auth; FIXME: implement login diff --git a/EstEIDToken/TokenSession.m b/EstEIDToken/TokenSession.m index eee2bd6..27b306a 100644 --- a/EstEIDToken/TokenSession.m +++ b/EstEIDToken/TokenSession.m @@ -164,9 +164,7 @@ - (BOOL)tokenSession:(TKTokenSession *)session supportsOperation:(TKTokenOperati switch (operation) { case TKTokenOperationSignData: supports = keyItem.canSign && ( -#if ENABLE_RSA [algorithm isAlgorithm:kSecKeyAlgorithmRSASignatureRaw] || -#endif [algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureRFC4754] || [algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962] || [algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962SHA1] || @@ -223,7 +221,6 @@ - (NSData *)tokenSession:(TKTokenSession *)session signData:(NSData *)dataToSign } NSData *sign = dataToSign; -#if ENABLE_RSA if ([algorithm isAlgorithm:kSecKeyAlgorithmRSASignatureRaw]) { NSLog(@"EstEIDToken Remove PKCS1 1.5 padding"); // 00 01 FF FF 00 .... @@ -232,7 +229,6 @@ - (NSData *)tokenSession:(TKTokenSession *)session signData:(NSData *)dataToSign NSUInteger pos = (NSUInteger)(e - string) + 1; sign = [dataToSign subdataWithRange:NSMakeRange(pos, dataToSign.length - pos)]; } -#endif NSData *response = [self.smartCard sendIns:0x88 p1:0x00 p2:0x00 data:sign le:@0 sw:&sw error:error]; // Deauth and release session diff --git a/EstEIDTokenApp.xcodeproj/project.pbxproj b/EstEIDTokenApp.xcodeproj/project.pbxproj index c08b030..d21c66e 100644 --- a/EstEIDTokenApp.xcodeproj/project.pbxproj +++ b/EstEIDTokenApp.xcodeproj/project.pbxproj @@ -601,11 +601,6 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = EstEIDToken/EstEIDToken.entitlements; COMBINE_HIDPI_IMAGES = YES; - ENABLE_RSA = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "ENABLE_RSA=$(ENABLE_RSA)", - ); INFOPLIST_FILE = EstEIDToken/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -623,11 +618,6 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = EstEIDToken/EstEIDToken.entitlements; COMBINE_HIDPI_IMAGES = YES; - ENABLE_RSA = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "ENABLE_RSA=$(ENABLE_RSA)", - ); INFOPLIST_FILE = EstEIDToken/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)",