diff --git a/CryptoLib/CryptoLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist b/CryptoLib/CryptoLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
index 70305072b..0ea84e679 100644
--- a/CryptoLib/CryptoLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/CryptoLib/CryptoLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
CryptoLib.xcscheme_^#shared#^_
orderHint
- 4
+ 6
cdoc.xcscheme_^#shared#^_
orderHint
- 5
+ 4
diff --git a/MoppApp/MoppApp/EncryptedDataUtil.swift b/MoppApp/MoppApp/EncryptedDataUtil.swift
index 8be34e7c0..dafcb96f9 100644
--- a/MoppApp/MoppApp/EncryptedDataUtil.swift
+++ b/MoppApp/MoppApp/EncryptedDataUtil.swift
@@ -77,13 +77,12 @@ struct EncryptedDataUtil {
}
static func decryptSecret(_ data: Data, with symmetricKey: SymmetricKey) -> String? {
- guard let sealedBox = try? ChaChaPoly.SealedBox(combined: data) else { return nil }
-
do {
+ let sealedBox = try ChaChaPoly.SealedBox(combined: data)
let decryptedData = try ChaChaPoly.open(sealedBox, using: symmetricKey)
return String(data: decryptedData, encoding: .utf8)
} catch {
- printLog("Unable to decrypt secret: \(error.localizedDescription)")
+ printLog("Unable to decrypt encrypted secret: \(error.localizedDescription)")
return nil
}
}
diff --git a/MoppApp/MoppApp/IdCardViewController.swift b/MoppApp/MoppApp/IdCardViewController.swift
index 788421b85..1b618aa85 100644
--- a/MoppApp/MoppApp/IdCardViewController.swift
+++ b/MoppApp/MoppApp/IdCardViewController.swift
@@ -119,7 +119,11 @@ class IdCardViewController : MoppViewController, TokenFlowSigning {
@objc func editingChanged(sender: UITextField) {
let count = (sender.text?.count ?? 0)
- actionButton.isEnabled = count >= 4 && count <= 6
+ if self.isActionDecryption {
+ actionButton.isEnabled = count >= 4 && count <= 12
+ } else {
+ actionButton.isEnabled = count >= 5 && count <= 12
+ }
if !actionButton.isEnabled {
actionButton.backgroundColor = UIColor.moppBackgroundDark
}
diff --git a/MoppApp/MoppApp/KeychainUtil.swift b/MoppApp/MoppApp/KeychainUtil.swift
index 7a68ef5ba..054e0da75 100644
--- a/MoppApp/MoppApp/KeychainUtil.swift
+++ b/MoppApp/MoppApp/KeychainUtil.swift
@@ -27,17 +27,32 @@ import Security
class KeychainUtil {
static func save(key: String, info: Data, withPasscodeSetOnly: Bool = false) -> Bool {
guard let bundleIdentifier = Bundle.main.bundleIdentifier else { return false }
+
let query: [CFString: Any] = [
kSecClass: kSecClassGenericPassword,
kSecAttrService: bundleIdentifier,
kSecAttrAccount: "\(bundleIdentifier).\(key)",
+ ]
+
+ let attributes: [CFString: Any] = [
kSecValueData: info,
kSecAttrAccessible: withPasscodeSetOnly ? kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly : kSecAttrAccessibleWhenUnlockedThisDeviceOnly
]
- SecItemDelete(query as CFDictionary)
- let status = SecItemAdd(query as CFDictionary, nil)
+
+ let status = SecItemUpdate(query as CFDictionary, attributes as CFDictionary)
- return status == errSecSuccess
+ if status == errSecSuccess {
+ return true
+ } else if status == errSecItemNotFound {
+ // Item does not exist yet, add it
+ let queryWithAttributes = query.merging(attributes) { (_, new) in new }
+
+ let addStatus = SecItemAdd(queryWithAttributes as CFDictionary, nil)
+ return addStatus == errSecSuccess
+ } else {
+ printLog("Unable to save \(key): \(status)")
+ return false
+ }
}
static func retrieve(key: String) -> Data? {
diff --git a/MoppApp/MoppApp/LandingViewController.swift b/MoppApp/MoppApp/LandingViewController.swift
index e20bb09a2..a27cdbc71 100644
--- a/MoppApp/MoppApp/LandingViewController.swift
+++ b/MoppApp/MoppApp/LandingViewController.swift
@@ -135,7 +135,6 @@ class LandingViewController : UIViewController, NativeShare, ContainerActions
presentButtons([.signTab, .cryptoTab, .myeIDTab])
selectTabButton(.signTab)
- NotificationCenter.default.addObserver(self, selector: #selector(receiveErrorNotification), name: .errorNotificationName, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(receiveStartImportingFilesWithDocumentPickerNotification), name: .startImportingFilesWithDocumentPickerNotificationName, object: nil)
LandingViewController.onDataFileAddedAccessibility = {
NotificationCenter.default.addObserver(
@@ -227,23 +226,6 @@ class LandingViewController : UIViewController, NativeShare, ContainerActions
controller.tabBarItem.image = image
controller.tabBarItem.selectedImage = selectedImage
}
-
- @objc func receiveErrorNotification(_ notification: Notification) {
- guard let userInfo = notification.userInfo else { return }
- let error = userInfo[kErrorKey] as? NSError
- var errorMessage = error?.userInfo[NSLocalizedDescriptionKey] as? String ??
- userInfo[kErrorMessage] as? String
- guard let strongErrorMessage = errorMessage else { return }
- errorMessage = MoppLib_LocalizedString(strongErrorMessage)
- let alert = UIAlertController(
- title: L(.errorAlertTitleGeneral),
- message: errorMessage,
- preferredStyle: .alert)
-
- presentedViewController?.dismiss(animated: false, completion: nil)
- alert.addAction(UIAlertAction(title: L(.actionOk), style: .default, handler: nil))
- present(alert, animated: true)
- }
@objc func receiveStartImportingFilesWithDocumentPickerNotification(_ notification: Notification) {
fileImportIntent = notification.userInfo![kKeyFileImportIntent] as? MoppApp.FileImportIntent
diff --git a/MoppApp/MoppApp/LocalizationKeys.swift b/MoppApp/MoppApp/LocalizationKeys.swift
index d5a751ef2..f550ec2df 100644
--- a/MoppApp/MoppApp/LocalizationKeys.swift
+++ b/MoppApp/MoppApp/LocalizationKeys.swift
@@ -169,6 +169,8 @@ enum LocKey : String
case nfcTitle = "nfc-title"
case nfcCANTitle = "nfc-can-title"
case nfcDeviceNoSupport = "nfc-device-no-support"
+ case nfcCanLocation = "nfc-can-location"
+ case nfcIncorrectLength = "nfc-incorrect-length"
case nfcHoldNear = "nfc-hold-near"
case nfcMultipleCards = "nfc-multiple-cards"
case nfcInvalidTag = "nfc-invalid-tag"
@@ -183,6 +185,8 @@ enum LocKey : String
case nfcPinLocked = "nfc-pin-locked"
case nfcCertParseFailed = "nfc-cert-parse-failed"
case nfcCertExpired = "nfc-cert-expired"
+ case nfcWrongPin1 = "nfc-wrong-pin1"
+ case nfcWrongPin2 = "nfc-wrong-pin2"
case containerSignTitle = "container-sign-title"
case containerEncryptionTitle = "container-encryption-title"
case containerDecryptionTitle = "container-decryption-title"
diff --git a/MoppApp/MoppApp/NFCEditViewController.swift b/MoppApp/MoppApp/NFCEditViewController.swift
index 1c0973b8a..8902dda47 100644
--- a/MoppApp/MoppApp/NFCEditViewController.swift
+++ b/MoppApp/MoppApp/NFCEditViewController.swift
@@ -35,7 +35,7 @@ class NFCEditViewController : MoppViewController, TokenFlowSigning {
@IBOutlet weak var titleLabel: UILabel!
@IBOutlet weak var canTextLabel: UILabel!
@IBOutlet weak var pinTextLabel: UILabel!
- @IBOutlet weak var canTextErrorLabel: UILabel!
+ @IBOutlet weak var canTextInfoLabel: ScaledLabel!
@IBOutlet weak var pinTextErrorLabel: UILabel!
@IBOutlet weak var cancelButton: MoppButton!
@IBOutlet weak var signButton: MoppButton!
@@ -56,8 +56,8 @@ class NFCEditViewController : MoppViewController, TokenFlowSigning {
pinTextLabel.text = L(.pin2TextfieldLabel)
pinTextLabel.isHidden = notAvailable
- canTextErrorLabel.text = ""
- canTextErrorLabel.isHidden = true
+ setCANDefaultText()
+
pinTextErrorLabel.text = ""
pinTextErrorLabel.isHidden = true
@@ -84,6 +84,20 @@ class NFCEditViewController : MoppViewController, TokenFlowSigning {
tapGR.addTarget(self, action: #selector(cancelAction))
view.addGestureRecognizer(tapGR)
}
+
+ override func viewDidAppear(_ animated: Bool) {
+ super.viewDidAppear(animated)
+
+ if let canNumber = canTextField.text {
+ if !canNumber.isEmpty && canNumber.count != 6 {
+ setCANErrorText()
+ } else {
+ setCANDefaultText()
+ }
+ } else {
+ setCANDefaultText()
+ }
+ }
@objc func dismissKeyboard(_ notification: NSNotification) {
pinTextField.resignFirstResponder()
@@ -196,6 +210,18 @@ class NFCEditViewController : MoppViewController, TokenFlowSigning {
override func keyboardWillHide(notification: NSNotification) {
hideKeyboard(scrollView: scrollView)
}
+
+ func setCANDefaultText() {
+ canTextInfoLabel.text = L(.nfcCanLocation)
+ canTextInfoLabel.isHidden = false
+ canTextInfoLabel.textColor = UIColor.moppText
+ }
+
+ func setCANErrorText() {
+ canTextInfoLabel.text = L(.nfcIncorrectLength)
+ canTextInfoLabel.isHidden = false
+ canTextInfoLabel.textColor = UIColor.moppError
+ }
}
extension NFCEditViewController : UITextFieldDelegate {
@@ -226,12 +252,17 @@ extension NFCEditViewController : UITextFieldDelegate {
func textFieldDidEndEditing(_ textField: UITextField) {
if textField.accessibilityIdentifier == "nfcCanField" {
if let can = textField.text {
+ if !can.isEmpty && can.count != 6 {
+ setCANErrorText()
+ } else {
+ setCANDefaultText()
+ }
do {
let symKey = try EncryptedDataUtil.getSymmetricKey(fileName: NFCEditViewController.nfcCANKeyFilename)
if let encryptedKey = EncryptedDataUtil.encryptSecret(can, with: symKey) {
_ = KeychainUtil.save(key: NFCEditViewController.nfcCANKey, info: encryptedKey, withPasscodeSetOnly: true)
} else {
- printLog("Encryption failed for 'can' string")
+ printLog("Encryption failed for 'CAN' string")
}
} catch {
do {
@@ -249,8 +280,7 @@ extension NFCEditViewController : UITextFieldDelegate {
}
} else {
KeychainUtil.remove(key: NFCEditViewController.nfcCANKey)
- canTextErrorLabel.text = ""
- canTextErrorLabel.isHidden = true
+ setCANDefaultText()
removeViewBorder(view: textField)
UIAccessibility.post(notification: .layoutChanged, argument: canTextField)
}
diff --git a/MoppApp/MoppApp/NFCSignature.swift b/MoppApp/MoppApp/NFCSignature.swift
index 2543cab6b..5c456474a 100644
--- a/MoppApp/MoppApp/NFCSignature.swift
+++ b/MoppApp/MoppApp/NFCSignature.swift
@@ -83,6 +83,7 @@ class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
var ksEnc: Bytes?
var ksMac: Bytes?
var SSC: Bytes?
+ var invalidateWithError: Bool = false
func createNFCSignature(can: String, pin: String, containerPath: String, hashType: String, roleData: MoppLibRoleAddressData?) -> Void {
guard NFCTagReaderSession.readingAvailable else {
@@ -92,6 +93,7 @@ class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
CAN = can
PIN = pin
self.containerPath = containerPath
+ invalidateWithError = false
session = NFCTagReaderSession(pollingOption: .iso14443, delegate: self)
session?.alertMessage = L(.nfcHoldNear)
session?.begin()
@@ -107,6 +109,8 @@ class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
@Sendable func setSessionMessage(_ msg: String, invalidate: Bool = false) -> Void {
+ invalidateWithError = invalidate
+
if invalidate {
session.invalidate(errorMessage: msg)
} else {
@@ -214,7 +218,7 @@ class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
switch attemptsLeft {
case 0: setSessionMessage(L(.pin2BlockedAlert), invalidate: true)
case 1: setSessionMessage(L(.wrongPin2Single), invalidate: true)
- default: setSessionMessage(L(.wrongPin2, [attemptsLeft]), invalidate: true)
+ default: setSessionMessage(L(.nfcWrongPin2, [attemptsLeft]), invalidate: true)
}
} catch NFCError.error(let msg) {
printLog("\nRIA.NFC - error \(msg)")
@@ -230,11 +234,13 @@ class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
}
func tagReaderSession(_ session: NFCTagReaderSession, didInvalidateWithError error: Error) {
- if let readerError = error as? NFCReaderError,
- readerError.code == .readerSessionInvalidationErrorUserCanceled {
- CancelUtil.handleCancelledRequest(errorMessageDetails: "User cancelled NFC signing")
- } else {
- CancelUtil.handleCancelledRequest(errorMessageDetails: "Session Invalidated")
+ if !invalidateWithError {
+ if let readerError = error as? NFCReaderError,
+ readerError.code == .readerSessionInvalidationErrorUserCanceled {
+ CancelUtil.handleCancelledRequest(errorMessageDetails: "User cancelled NFC signing")
+ } else {
+ CancelUtil.handleCancelledRequest(errorMessageDetails: "Session Invalidated")
+ }
}
self.session = nil
}
diff --git a/MoppApp/MoppApp/TokenFlow.storyboard b/MoppApp/MoppApp/TokenFlow.storyboard
index 7373559da..34410b3ea 100644
--- a/MoppApp/MoppApp/TokenFlow.storyboard
+++ b/MoppApp/MoppApp/TokenFlow.storyboard
@@ -3,7 +3,7 @@
-
+
@@ -1418,7 +1418,7 @@
-
+
-
+
diff --git a/MoppApp/MoppApp/en.lproj/Localizable.strings b/MoppApp/MoppApp/en.lproj/Localizable.strings
index ca5006af8..2412f96a7 100755
--- a/MoppApp/MoppApp/en.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/en.lproj/Localizable.strings
@@ -230,11 +230,13 @@
"smart-id-country-latvia" = "Latvia";
"smart-id-challenge-title" = "Sign with Smart-ID";
"smart-id-sign-help-title" = "Make sure control code matches with one in phone screen and enter Smart-ID PIN2 code";
-"nfc-title" = "Enter your ID-card access number and PIN2 code to sign with ID-card";
-"nfc-can-title" = "ID-card access number";
-"nfc-device-no-support" = "This device does not support NFC.";
+"nfc-title" = "Enter your ID-card access number (CAN) and PIN2 code to sign with ID-card";
+"nfc-can-title" = "ID-card access number (CAN)";
+"nfc-device-no-support" = "This device does not support contactless connection or NFC is turned off.";
+"nfc-can-location" = "The 6-digit number is located under the document photo";
+"nfc-incorrect-length" = "CAN-code must be 6 digits long";
"nfc-hold-near" = "Hold your phone near the ID-card";
-"nfc-multiple-cards" = "More than 1 NFC tag is detected, please remove all NFC tags and try again";
+"nfc-multiple-cards" = "More than 1 NFC tag is detected. Please remove all NFC tags and try again.";
"nfc-invalid-tag" = "Invalid NFC tag";
"nfc-unable-connect" = "Unable to connect to NFC tag";
"nfc-auth" = "Authenticating with ID-card";
@@ -243,9 +245,11 @@
"nfc-sign-done" = "Signing done";
"nfc-auth-failed" = "Failed to authenticate with ID-card";
"nfc-sign-failed" = "Failed to sign document with ID-card";
-"nfc-pin-locked" = "Locked PIN";
+"nfc-pin-locked" = "PIN2 has been blocked";
"nfc-cert-parse-failed" = "Certificate parsing failed";
"nfc-cert-expired" = "An expired certificate cannot be used for signing";
+"nfc-wrong-pin2" = "Wrong PIN2. Remaining attempts: %d";
+"nfc-wrong-pin1" = "Wrong PIN1. Remaining attempts: %d";
"role-and-address" = "Role and address";
"role-and-address-title" = "Enter your role and address info";
"role-and-address-role-title" = "Role / resolution";
@@ -291,8 +295,8 @@
"wrong-pin1-single" = "Wrong PIN1. You have 1 attempt left until your PIN1 is blocked.";
"pin2-textfield-label" = "Enter PIN2";
"pin1-textfield-label" = "Enter PIN1";
-"pin2-blocked-alert" = "PIN2 blocked. The PIN code can be unlocked on the My eID page.";
-"pin1-blocked-alert" = "PIN1 blocked. The PIN code can be unlocked on the My eID page.";
+"pin2-blocked-alert" = "PIN2 has been blocked";
+"pin1-blocked-alert" = "PIN1 has been blocked";
"generic-error-message" = "Something went wrong. Please try again.";
"decryption-error-message" = "Something went wrong with decryption. Please try again.";
"signing-aborted-message" = "Signing process aborted";
diff --git a/MoppApp/MoppApp/et.lproj/Localizable.strings b/MoppApp/MoppApp/et.lproj/Localizable.strings
index f1bf24b7f..ec27b606f 100755
--- a/MoppApp/MoppApp/et.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/et.lproj/Localizable.strings
@@ -231,22 +231,26 @@
"smart-id-country-latvia" = "Läti";
"smart-id-challenge-title" = "Allkirjasta Smart-IDga";
"smart-id-sign-help-title" = "Veendu kontrollkoodi õigsuses ja sisesta nutiseadmes Smart-ID PIN2-kood";
-"nfc-title" = "ID-kaardiga allkirjastamiseks sisesta oma ID-kaardi ligipääsu number ja PIN2-kood";
-"nfc-can-title" = "ID-kaardi ligipääsu number";
-"nfc-device-no-support" = "See seade ei toeta NFC-d";
-"nfc-hold-near" = "Hoidke ID-kaarti telefoni lähedal";
-"nfc-multiple-cards" = "Rohkem kui 1 NFC märgis on tuvastatud, eemaldage kõik NFC-märgisega esemed ja proovige uuesti";
-"nfc-invalid-tag" = "Kehtetu NFC-märgis";
-"nfc-unable-connect" = "NFC-ega ei saa ühendust luua";
-"nfc-auth" = "Isikutuvastus ID-kaardiga";
+"nfc-title" = "ID-kaardiga allkirjastamiseks sisesta oma ID-kaardi ligipääsu number (CAN) ja PIN2 kood";
+"nfc-can-title" = "ID-kaardi ligipääsu number (CAN)";
+"nfc-device-no-support" = "See seade ei toeta kontaktivaba ühendust või NFC on välja lülitatud.";
+"nfc-can-location" = "6-kohaline number asub dokumendil foto all";
+"nfc-incorrect-length" = "Ligipääsu number (CAN) peab olema 6-kohaline";
+"nfc-hold-near" = "Hoia ID-kaarti telefoni lähedal";
+"nfc-multiple-cards" = "Tuvastatud on rohkem kui üks NFC-element. Eemalda kõik NFC-elemendiga esemed ja proovi uuesti.";
+"nfc-invalid-tag" = "Kehtetu NFC-element";
+"nfc-unable-connect" = "Kontaktivaba ühendust ei saa luua";
+"nfc-auth" = "ID-kaardiga kontaktivaba ühenduse loomine";
"nfc-reading-cert" = "Sertifikaadi lugemine";
-"nfc-sign-doc" = "Allkirjasta dokument";
+"nfc-sign-doc" = "Ümbriku allkirjastamine";
"nfc-sign-done" = "Allkiri lisatud";
"nfc-auth-failed" = "Isikutuvastus ID-kaardiga ebaõnnestus";
-"nfc-sign-failed" = "Failed to sign document with ID-card";
-"nfc-pin-locked" = "Locked PIN";
-"nfc-cert-parse-failed" = "Certificate parsing failed";
+"nfc-sign-failed" = "Ümbriku allkirjastamine ebaõnnestus";
+"nfc-pin-locked" = "PIN2 on blokeeritud";
+"nfc-cert-parse-failed" = "Viga sertifikaadi parsimisel";
"nfc-cert-expired" = "Aegunud sertifikaati ei saa kasutada allkirjastamiseks";
+"nfc-wrong-pin2" = "Vale PIN2. Katseid jäänud: %d";
+"nfc-wrong-pin1" = "Vale PIN1. Katseid jäänud: %d";
"role-and-address" = "Roll ja aadress";
"role-and-address-title" = "Sisesta oma roll ja aadress";
"role-and-address-role-title" = "Roll / resolutsioon";
@@ -287,8 +291,8 @@
"card-reader-state-initial" = "Ühenda kaardilugeja nutiseadmega ja sisesta ID-kaart lugejasse.";
"pin2-textfield-label" = "Sisesta PIN2";
"pin1-textfield-label" = "Sisesta PIN1";
-"pin2-blocked-alert" = "PIN2 on lukus. PIN-koodi saab lukust avada Minu eID lehel.";
-"pin1-blocked-alert" = "PIN1 on lukus. PIN-koodi saab lukust avada Minu eID lehel.";
+"pin2-blocked-alert" = "PIN2 on blokeeritud";
+"pin1-blocked-alert" = "PIN1 on blokeeritud";
"generic-error-message" = "Midagi läks valesti. Palun proovi uuesti.";
"decryption-error-message" = "Midagi läks dekrüpteerimisel valesti. Palun proovi uuesti.";
"signing-error-too-many-requests" = "Sinu %@ tasuta allkirjade kuulimiit on ületatud. https://www.id.ee/artikkel/asutustele-kus-allkirjastatakse-digidoc4-kliendi-kaudu-suuremates-kogustes-dokumente/";
diff --git a/MoppApp/MoppApp/ru.lproj/Localizable.strings b/MoppApp/MoppApp/ru.lproj/Localizable.strings
index 3b2be72ed..5615deb55 100644
--- a/MoppApp/MoppApp/ru.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/ru.lproj/Localizable.strings
@@ -231,22 +231,26 @@
"smart-id-country-latvia" = "Латвия";
"smart-id-challenge-title" = "Подписать с помощью приложения Smart-ID";
"smart-id-sign-help-title" = "Убедитесь в правильности контрольного кода и введите PIN2-код для Smart-ID";
-"nfc-title" = "Введите номер доступа к карте и PIN2-код для подписи с помощью ID-карты";
-"nfc-can-title" = "Номер доступа к карте";
-"nfc-device-no-support" = "Это устройство не поддерживает NFC";
-"nfc-hold-near" = "Держите телефон рядом с ID-картой";
-"nfc-multiple-cards" = "Обнаружено более одной NFC-метки, пожалуйста, удалите все NFC-метки и повторите попытку";
+"nfc-title" = "Чтобы подписать с помощью ID-карты, введите ее номер доступа (CAN) и PIN2-код";
+"nfc-can-title" = "Номер доступа ID-карты (CAN)";
+"nfc-device-no-support" = "Данное устройство не поддерживает бесконтактное соединение или NFC отключен";
+"nfc-can-location" = "6-значный номер находится под фотографией на документе";
+"nfc-incorrect-length" = "Номер доступа (CAN) должен состоять из 6-цифр";
+"nfc-hold-near" = "Удерживайте ID-карту рядом с телефоном";
+"nfc-multiple-cards" = "Обнаружено более одной NFC-метки. Удалите все объекты с NFC-элементом (NFC-метки) и попробуйте снова.";
"nfc-invalid-tag" = "Недействительная NFC-метка";
-"nfc-unable-connect" = "Невозможно подключиться к NFC-метке";
-"nfc-auth" = "Идентификация личности по карте";
+"nfc-unable-connect" = "Бесконтактное соединение не может быть установлено";
+"nfc-auth" = "Создание бесконтактного соединения с ID-картой";
"nfc-reading-cert" = "Считывание сертификата";
-"nfc-sign-doc" = "Подписать документ";
+"nfc-sign-doc" = "Подписание конверта";
"nfc-sign-done" = "Подпись добавлена";
"nfc-auth-failed" = "Идентификация личности по карте не удалась";
-"nfc-sign-failed" = "Failed to sign document with ID-card";
-"nfc-pin-locked" = "Locked PIN";
-"nfc-cert-parse-failed" = "Certificate parsing failed";
+"nfc-sign-failed" = "Не удалось подписать контейнер";
+"nfc-pin-locked" = "PIN2 заблокирован";
+"nfc-cert-parse-failed" = "Ошибка при анализе сертификата";
"nfc-cert-expired" = "Сертификат с истекшим сроком действия не может быть использован для подписи";
+"nfc-wrong-pin2" = "Неверный PIN2-код. Оставшиеся попытки: %d";
+"nfc-wrong-pin1" = "Неверный PIN1-код. Оставшиеся попытки: %d";
"role-and-address" = "Роль и адрес";
"role-and-address-title" = "Введите свою роль и адрес";
"role-and-address-role-title" = "Роль / pезолюция";
@@ -292,8 +296,8 @@
"wrong-pin1-single" = "Неверный PIN1. У Вас осталась 1 попытка до блокировки Вашего PIN1.";
"pin2-textfield-label" = "Введите PIN2";
"pin1-textfield-label" = "Введите PIN1";
-"pin2-blocked-alert" = "PIN2 заблокирован. PIN-код можно разблокировать на странице Mой eID.";
-"pin1-blocked-alert" = "PIN1 заблокирован. PIN-код можно разблокировать на странице Mой eID.";
+"pin2-blocked-alert" = "PIN2 заблокирован";
+"pin1-blocked-alert" = "PIN1 заблокирован";
"generic-error-message" = "Что-то пошло не так. Пожалуйста, попробуйте снова.";
"decryption-error-message" = "Что-то пошло не так с дешифрованием. Пожалуйста, попробуйте снова.";
"signing-aborted-message" = "Процесс подписания прерван";
diff --git a/SkSigningLib/SkSigningLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist b/SkSigningLib/SkSigningLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
index c136c2ca3..41438bc41 100644
--- a/SkSigningLib/SkSigningLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/SkSigningLib/SkSigningLib.xcodeproj/xcuserdata/martenr.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
SkSigningLib.xcscheme_^#shared#^_
orderHint
- 4
+ 5