Skip to content

Commit 9a3102b

Browse files
metsmametsma
authored
Don't use string catalogs (open-eid#33)
IB-8186 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent bcc7c11 commit 9a3102b

11 files changed

Lines changed: 160 additions & 268 deletions

File tree

‎EstEIDToken/Localizable.xcstrings‎

Lines changed: 0 additions & 241 deletions
This file was deleted.

‎EstEIDToken/TokenSession.m‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ - (BOOL)tokenSession:(TKTokenSession *)session supportsOperation:(TKTokenOperati
244244
switch (operation) {
245245
case TKTokenOperationSignData:
246246
supports = keyItem.canSign && (
247-
[algorithm isAlgorithm:kSecKeyAlgorithmRSASignatureRaw] ||
248247
[algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureRFC4754] ||
249248
[algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962] ||
250249
[algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962SHA1] ||
@@ -253,9 +252,6 @@ - (BOOL)tokenSession:(TKTokenSession *)session supportsOperation:(TKTokenOperati
253252
[algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962SHA384] ||
254253
[algorithm isAlgorithm:kSecKeyAlgorithmECDSASignatureDigestX962SHA512]);
255254
break;
256-
case TKTokenOperationDecryptData:
257-
//supports = keyItem.canDecrypt && [algorithm isAlgorithm:kSecKeyAlgorithmRSAEncryptionRaw]; // FIXME: implement decryption
258-
break;
259255
case TKTokenOperationPerformKeyExchange:
260256
//supports = keyItem.canPerformKeyExchange && [algorithm isAlgorithm:kSecKeyAlgorithmECDHKeyExchangeStandard]; // FIXME: implement derive
261257
break;
@@ -283,18 +279,8 @@ - (NSData *)tokenSession:(TKTokenSession *)session signData:(NSData *)dataToSign
283279
return nil;
284280
}
285281

286-
NSData *sign = dataToSign;
287-
if ([algorithm isAlgorithm:kSecKeyAlgorithmRSASignatureRaw]) {
288-
NSLog(@"TokenSession Remove PKCS1 1.5 padding");
289-
// 00 01 FF FF 00 ....
290-
const char *string = dataToSign.bytes;
291-
char *e = strchr(&string[3], '\0'); // Start at pos 3
292-
NSUInteger pos = (NSUInteger)(e - string) + 1;
293-
sign = [dataToSign subdataWithRange:NSMakeRange(pos, dataToSign.length - pos)];
294-
}
295-
296282
UInt16 sw = 0;
297-
NSData *response = [self.smartCard sendIns:0x88 p1:0x00 p2:0x00 data:sign le:@0 sw:&sw error:error];
283+
NSData *response = [self.smartCard sendIns:0x88 p1:0x00 p2:0x00 data:dataToSign le:@0 sw:&sw error:error];
298284
// Deauth and release session
299285
[self closeSession];
300286
switch (sw)

‎EstEIDToken/en.lproj/Localizable.strings‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
Localizable.strings
3+
CryptoTokenKit
4+
*/
5+
6+
"AUTH_CERT" = "Certificate For Card Authentication";
7+
"SIGN_CERT" = "Certificate For Digital Signature";
8+
"AUTH_KEY" = "Key For Card Authentication";
9+
"SIGN_KEY" = "Key For Digital Signature";
10+
"WRONG_CONSTR" = "Unexpected constraint";
11+
"ENTER_PINPAD" = "Please enter PIN code on PinPAD";
12+
"INVALID_PIN" = "Invalid PIN entered";

‎EstEIDToken/en.lproj/Localizable.stringsdict‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>VERIFY_TRY_LEFT</key>
6+
<dict>
7+
<key>NSStringLocalizedFormatKey</key>
8+
<string>%1$#@tries@</string>
9+
<key>tries</key>
10+
<dict>
11+
<key>NSStringFormatSpecTypeKey</key>
12+
<string>NSStringPluralRuleType</string>
13+
<key>NSStringFormatValueTypeKey</key>
14+
<string>d</string>
15+
<key>zero</key>
16+
<string>PIN locked.
17+
Unblock to reuse PIN.</string>
18+
<key>one</key>
19+
<string>PIN Incorrect.
20+
PIN will be locked next failed attempt.</string>
21+
<key>other</key>
22+
<string>PIN Incorrect.
23+
%d tries left</string>
24+
</dict>
25+
</dict>
26+
</dict>
27+
</plist>

‎EstEIDToken/et.lproj/Localizable.strings‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
Localizable.strings
3+
CryptoTokenKit
4+
*/
5+
6+
"AUTH_CERT" = "Certificate For Card Authentication";
7+
"SIGN_CERT" = "Certificate For Digital Signature";
8+
"AUTH_KEY" = "Key For Card Authentication";
9+
"SIGN_KEY" = "Key For Digital Signature";
10+
"WRONG_CONSTR" = "Unexpected constraint";
11+
"ENTER_PINPAD" = "Palun sisestada PIN kaardilugeja sõrmistikult";
12+
"INVALID_PIN" = "Sisestati ebakorrektne PIN";

‎EstEIDToken/et.lproj/Localizable.stringsdict‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>VERIFY_TRY_LEFT</key>
6+
<dict>
7+
<key>NSStringLocalizedFormatKey</key>
8+
<string>%1$#@tries@</string>
9+
<key>tries</key>
10+
<dict>
11+
<key>NSStringFormatSpecTypeKey</key>
12+
<string>NSStringPluralRuleType</string>
13+
<key>NSStringFormatValueTypeKey</key>
14+
<string>d</string>
15+
<key>zero</key>
16+
<string>PIN on lukus.
17+
Tühista blokeering, et PIN-i taas kasutada.</string>
18+
<key>one</key>
19+
<string>Vale PIN.
20+
Järgmise vale koodi sisestamisel PIN lukustub.</string>
21+
<key>other</key>
22+
<string>Vale PIN.
23+
%d katset jäänud</string>
24+
</dict>
25+
</dict>
26+
</dict>
27+
</plist>

‎EstEIDToken/ru.lproj/Localizable.strings‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
Localizable.strings
3+
CryptoTokenKit
4+
*/
5+
6+
"AUTH_CERT" = "Certificate For Card Authentication";
7+
"SIGN_CERT" = "Certificate For Digital Signature";
8+
"AUTH_KEY" = "Key For Card Authentication";
9+
"SIGN_KEY" = "Key For Digital Signature";
10+
"WRONG_CONSTR" = "Unexpected constraint";
11+
"ENTER_PINPAD" = "Please enter PIN code on PinPAD";
12+
"INVALID_PIN" = "Invalid PIN entered";

0 commit comments

Comments
 (0)