Skip to content

Commit 2fd4cd0

Browse files
committed
Begin session to help parallel usage
IB-8374 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent b17b892 commit 2fd4cd0

15 files changed

Lines changed: 277 additions & 240 deletions

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

EstEIDToken/Localizable.xcstrings

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"sourceLanguage" : "en",
3+
"strings" : {
4+
"Invalid PIN entered" : {
5+
"localizations" : {
6+
"et" : {
7+
"stringUnit" : {
8+
"state" : "translated",
9+
"value" : "Sisestati ebakorrektne PIN"
10+
}
11+
},
12+
"ru" : {
13+
"stringUnit" : {
14+
"state" : "translated",
15+
"value" : "Invalid PIN entered"
16+
}
17+
}
18+
}
19+
},
20+
"Please enter PIN code on PinPAD" : {
21+
"localizations" : {
22+
"et" : {
23+
"stringUnit" : {
24+
"state" : "translated",
25+
"value" : "Palun sisestada PIN kaardilugeja sõrmistikult"
26+
}
27+
},
28+
"ru" : {
29+
"stringUnit" : {
30+
"state" : "translated",
31+
"value" : "Пожалуйста, введите PIN-код на PinPAD"
32+
}
33+
}
34+
}
35+
},
36+
"VERIFY_TRY_LEFT" : {
37+
"localizations" : {
38+
"en" : {
39+
"variations" : {
40+
"plural" : {
41+
"one" : {
42+
"stringUnit" : {
43+
"state" : "translated",
44+
"value" : "PIN Incorrect.\nPIN will be locked next failed attempt."
45+
}
46+
},
47+
"other" : {
48+
"stringUnit" : {
49+
"state" : "translated",
50+
"value" : "PIN Incorrect.\n%d tries left"
51+
}
52+
},
53+
"zero" : {
54+
"stringUnit" : {
55+
"state" : "translated",
56+
"value" : "PIN locked.\nUnblock to reuse PIN."
57+
}
58+
}
59+
}
60+
}
61+
},
62+
"et" : {
63+
"variations" : {
64+
"plural" : {
65+
"one" : {
66+
"stringUnit" : {
67+
"state" : "translated",
68+
"value" : "Vale PIN.\nJärgmise vale koodi sisestamisel PIN lukustub."
69+
}
70+
},
71+
"other" : {
72+
"stringUnit" : {
73+
"state" : "translated",
74+
"value" : "Vale PIN.\n%d katset jäänud"
75+
}
76+
},
77+
"zero" : {
78+
"stringUnit" : {
79+
"state" : "translated",
80+
"value" : "PIN on lukus.\nTühista blokeering, et PIN-i taas kasutada."
81+
}
82+
}
83+
}
84+
}
85+
},
86+
"ru" : {
87+
"variations" : {
88+
"plural" : {
89+
"one" : {
90+
"stringUnit" : {
91+
"state" : "translated",
92+
"value" : "Неверный PIN.\nPIN будет заблокирован при следующей неудачной попытке"
93+
}
94+
},
95+
"other" : {
96+
"stringUnit" : {
97+
"state" : "translated",
98+
"value" : "Неправильный PIN.\nОсталось %d попыток"
99+
}
100+
},
101+
"zero" : {
102+
"stringUnit" : {
103+
"state" : "translated",
104+
"value" : "PIN заблокирован.\nРазблокируйте его для повторного использования PIN."
105+
}
106+
}
107+
}
108+
}
109+
}
110+
}
111+
}
112+
},
113+
"version" : "1.0"
114+
}

EstEIDToken/Token.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ extension TKSmartCard {
9999
}
100100

101101
var data = Data()
102+
data.reserveCapacity(Int(size))
102103
do {
103104
while data.count < size {
104105
data.append(try sendCheck(ins: 0xB0, p1: UInt8(data.count >> 8), p2: UInt8(truncatingIfNeeded: data.count), le: min(le, Int(size) - data.count)))
@@ -121,7 +122,7 @@ class Token<T : TokenSession> : TKSmartCardToken, TKTokenDelegate {
121122
func token(_ token: TKToken, terminateSession session: TKTokenSession) {
122123
NSLog("Token terminateSession")
123124
if let sess = session as? TokenSession {
124-
sess.smartCard.isSensitive = false
125+
sess.closeSession()
125126
}
126127
}
127128

@@ -144,12 +145,12 @@ class Token<T : TokenSession> : TKSmartCardToken, TKTokenDelegate {
144145
NSLog("Token initWithSmartCard failed to create certificate item")
145146
throw TKError(.corruptedData)
146147
}
147-
certificateItem.setName(NSLocalizedString("AUTH_CERT", comment: "Cert label"))
148+
certificateItem.setName("Certificate For Card Authentication")
148149
guard let keyItem = TKTokenKeychainKey(certificate: certificate, objectID: keyID) else {
149150
NSLog("Token initWithSmartCard failed to create key item")
150151
throw TKError(.corruptedData)
151152
}
152-
keyItem.setName(NSLocalizedString("AUTH_KEY", comment: "Key label"))
153+
keyItem.setName("Key For Card Authentication")
153154
keyItem.canSign = true
154155
keyItem.canDecrypt = false
155156
keyItem.isSuitableForLogin = false

0 commit comments

Comments
 (0)