status-im
/
Keycard.swift
mirror of https://github.com/status-im/Keycard.swift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compilation

This commit is contained in:
Michele Balistreri 2019-11-04 10:48:43 +03:00
parent 49a0bebe82
commit 675eb48024
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Keycard/CashCommandSet.swift
View File

@ -3,8 +3,12 @@ import Foundation
public class CashCommandSet {
let cardChannel: CardChannel
public init(cardChannel: CardChannel) {
self.cardChannel = cardChannel
}
public func select() throws -> APDUResponse {
let selectApplet: APDUCommand = APDUCommand(cla: CLA.iso7816.rawValue, ins: ISO7816INS.select.rawValue, p1: 0x04, p2: 0x00, data: Identifier.keycardCashInstanceAID)
let selectApplet: APDUCommand = APDUCommand(cla: CLA.iso7816.rawValue, ins: ISO7816INS.select.rawValue, p1: 0x04, p2: 0x00, data: Identifier.keycardCashInstanceAID.val)
return try cardChannel.send(selectApplet)
}

10
Sources/Keycard/KeycardCommandSet.swift
View File

@ -84,11 +84,15 @@ public class KeycardCommandSet {
public func setNDEF(ndef: [UInt8]) throws -> APDUResponse {
let len = (Int(ndef[0]) << 8) | Int(ndef[1])
var finalNDEF: [UInt8]
if len != (ndef.count - 2) {
ndef = [UInt8(ndef.count >> 8), UInt8(ndef.count & 0xff)] + ndef
finalNDEF = [UInt8(ndef.count >> 8), UInt8(ndef.count & 0xff)] + ndef
} else {
finalNDEF = ndef
}
return try storeData(data: ndef, type: StoreDataP1.ndef.rawValue)
return try storeData(data: finalNDEF, type: StoreDataP1.ndef.rawValue)
}
public func storeData(data: [UInt8], type: UInt8) throws -> APDUResponse {
@ -97,7 +101,7 @@ public class KeycardCommandSet {
}
public func getData(type: UInt8) throws -> APDUResponse {
let cmd = secureChannel.protectedCommand(cla: CLA.proprietary.rawValue, ins: KeycardINS.getData.rawValue, p1: type, p2: 0, data: data)
let cmd = secureChannel.protectedCommand(cla: CLA.proprietary.rawValue, ins: KeycardINS.getData.rawValue, p1: type, p2: 0, data: [])
return try secureChannel.transmit(channel: cardChannel, cmd: cmd)
}