GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2020-02-25 12:11:44 +03:00
parent 1fa4b60614
commit f51329384e
2 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
View file

@ -63,12 +63,11 @@ class ReadUserDataResponse(
class ReadUserDataCommand: CommandSerializer<ReadUserDataResponse>() {
override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
val serializedTlv = TlvBuilder().apply {
append(TlvTag.CardId, cardEnvironment.cardId)
append(TlvTag.Pin, cardEnvironment.pin1)
}.serialize()
val builder = TlvBuilder()
builder.append(TlvTag.CardId, cardEnvironment.cardId)
builder.append(TlvTag.Pin, cardEnvironment.pin1)
return CommandApdu(Instruction.ReadUserData, serializedTlv)
return CommandApdu(Instruction.ReadUserData, builder.serialize())
}
override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): ReadUserDataResponse? {

29
tangem-core/src/main/java/com/tangem/commands/WriteUserDataCommand.kt
View file

@ -32,25 +32,22 @@ class WriteUserDataResponse(
* Writing of User_Counter and User_Data protected only by PIN1.
* User_ProtectedCounter and User_ProtectedData additionaly need PIN2 to confirmation.
*/
class WriteUserDataCommand(
private val userData: ByteArray? = null,
private val userProtectedData: ByteArray? = null,
class WriteUserDataCommand(private val userData: ByteArray? = null, private val userProtectedData: ByteArray? = null,
private val userCounter: Int? = null,
private val userProtectedCounter: Int? = null
): CommandSerializer<WriteUserDataResponse>() {
private val userProtectedCounter: Int? = null): CommandSerializer<WriteUserDataResponse>() {
override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
val serializedTlv = TlvBuilder().apply {
append(TlvTag.CardId, cardEnvironment.cardId)
append(TlvTag.Pin, cardEnvironment.pin1)
append(TlvTag.UserData, userData)
append(TlvTag.UserCounter, userCounter)
append(TlvTag.UserProtectedData, userProtectedData)
append(TlvTag.UserProtectedCounter, userProtectedCounter)
if (userProtectedCounter != null || userProtectedData != null)
append(TlvTag.Pin2, cardEnvironment.pin2)
}.serialize()
return CommandApdu(Instruction.WriteUserData, serializedTlv)
val builder = TlvBuilder()
builder.append(TlvTag.CardId, cardEnvironment.cardId)
builder.append(TlvTag.Pin, cardEnvironment.pin1)
builder.append(TlvTag.UserData, userData)
builder.append(TlvTag.UserCounter, userCounter)
builder.append(TlvTag.UserProtectedData, userProtectedData)
builder.append(TlvTag.UserProtectedCounter, userProtectedCounter)
if (userProtectedCounter != null || userProtectedData != null)
builder.append(TlvTag.Pin2, cardEnvironment.pin2)
return CommandApdu(Instruction.WriteUserData, builder.serialize())
}
override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): WriteUserDataResponse? {