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 2018-07-22 15:26:06 +03:00
parent eda078384e
commit a2a28c9c23
4 changed files with 64 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View file

Binary file not shown.

2
app/src/main/java/com/tangem/domain/cardReader/CardProtocol.java
View file

@ -617,7 +617,7 @@ public class CardProtocol {
mCard.setRemainingSignatures(readResult.getTagAsInt(TLV.Tag.TAG_RemainingSignatures));
if (readResult != null && readResult.getTLV(TLV.Tag.TAG_SignedHashes) != null) {
mCard.setSignHashes(readResult.getTLV(TLV.Tag.TAG_SignedHashes).Value);
mCard.setSignedHashes(readResult.getTagAsInt(TLV.Tag.TAG_SignedHashes));
}
} else {

123
app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java
View file

@ -12,12 +12,10 @@ public class BalanceValidator {
}
public String GetSecondLine()
{
if(score < 0) score = 0;
if (score ==0) {
return "Do not accept. " + secondLine;
} else {
return score + "% safe. " + secondLine;
}
if (score>89) { return "Safe to accept. " + secondLine;}
else if (score>74) { return "Not fully safe to accept. " + secondLine;}
else if (score>30) { return "Not safe to accept. " + secondLine;}
else { return "Do not accept! " + secondLine;}
}
public int GetColor() {
if (score>89) { return R.color.msg_okay;}
@ -46,7 +44,6 @@ public class BalanceValidator {
return;
}
// rule 2.c
if(!CheckAttestationServiceResult(card) && CheckAttestationServiceAvailable(card)) {
score = 0;
@ -55,17 +52,56 @@ public class BalanceValidator {
return;
}
// rule 3
if(CheckOnlineBalance(card) && !NotConfirmTransaction(card))
// rule 6
if(NotConfirmTransaction(card))
{
if(card.isBalanceRecieved() && card.isBalanceEqual()) {
score = 100;
firstLine = "Verified balance";
secondLine += "Confirmed balance and banknote identity. ";
if(card.getBalance() == 0) {
firstLine = "Zero balance";
}
score = 0;
firstLine = "Unguaranted balance";
secondLine = "Loading in progress. Wait for full confirmation in blockchain. ";
return;
}
// rule 5
if(IsLostSecondRead(card))
{
score = 0;
secondLine = "Wallet and note keys were not verified. Tap again. ";
return;
}
if(card.isBalanceRecieved() && card.isBalanceEqual()) {
score = 100;
firstLine = "Verified balance";
secondLine = "Balance confirmed in blockchain. ";
if(card.getBalance() == 0) {
firstLine = "";
}
}
// rule 4 TODO: need to check SignedHashed against number of outputs in blockchain
if(HasEverSigned(card))
{
score = 80;
firstLine = "Unguaranteed balance";
secondLine = "Potential unsent transaction. Redeem immediately if accept. ";
return;
}
// rule 7
if(CheckOfflineBalance(card) && !CheckOnlineBalance(card))
{
score = 80;
firstLine = "Verified offline balance";
secondLine = "Can't obtain balance from blockchain. Restore internet connection to be more confident. ";
}
// rule 2.b
if(CheckAttestationServiceAvailable(card))
{
secondLine += "Verified note identity. ";
} else {
score = 80;
secondLine += "Card identity was not verified. Cannot reach Tangem attestation service. ";
}
// if(card.getFailedBalanceRequestCounter()!=0) {
// score -= 5 * card.getFailedBalanceRequestCounter();
@ -74,62 +110,14 @@ public class BalanceValidator {
// return;
// }
//
//
// if(card.isBalanceRecieved() && !card.isBalanceEqual()) {
// score = 0;
// firstLine = "Disputed balance";
// secondLine += " Cannot obtain trusted balance at the moment. Try to tap and check this banknote later.";
// return;
// }
}
// rule 7
if(CheckOfflineBalance(card) && !CheckOnlineBalance(card))
{
score = 90;
firstLine = "Verified offline balance";
secondLine += "Restore internet connection to be more confident. ";
if(score <= 0)
return;
}
// rule 2.b
if(!CheckAttestationServiceAvailable(card))
{
score -= 15;
secondLine += "Card identity was not verified. Cannot reach attestation service. ";
if(score <= 0)
return;
}
// rule 5
if(IsLostSecondRead(card))
{
score -= 30;
secondLine += "Wallet and banknote keys were not verified. Tap again. ";
if(score <= 0)
return;
}
// rule 4
if(!CheckSignHashes(card))
{
score -= 50;
firstLine = "Unguaranteed balance";
secondLine += "Potential unsent transaction at the moment. Check this banknote later. ";
if(score <= 0)
return;
}
// rule 6
if(NotConfirmTransaction(card))
{
score -= 50;
String firstLine = "Unguaranted balance";
secondLine += " Loading in progress. Wait for full confirmation in blockchain. ";
if(score <= 0)
return;
}
}
@ -148,9 +136,10 @@ public class BalanceValidator {
return card.isWalletPublicKeyValid();
}
boolean CheckSignHashes(TangemCard card)
boolean HasEverSigned(TangemCard card)
{
return card.getSignHashes()==null;
// return card.getSignedHashes() != 0 || card.getRemainingSignatures() != card.getMaxSignatures();
return card.getRemainingSignatures() != card.getMaxSignatures();
}
boolean CheckAttestationServiceAvailable(TangemCard card)

14
app/src/main/java/com/tangem/domain/wallet/TangemCard.java
View file

@ -1214,13 +1214,13 @@ public class TangemCard {
return Denomination;
}
public byte[] SignHashes;
public void setSignHashes(byte[] SignHashes) {
this.SignHashes = SignHashes;
public int SignedHashes = -1; // Will remain -1 if tag was not found on card (= not safe to accept)
public void setSignedHashes(int SignedHashes) {
this.SignedHashes = SignedHashes;
}
public byte[] getSignHashes() {
return SignHashes;
public int getSignedHashes() {
return SignedHashes;
}
@ -1313,7 +1313,7 @@ public class TangemCard {
if(failedBalanceRequestCounter != null)
B.putInt("FailedBalance", failedBalanceRequestCounter.get());
if(getSignHashes()!=null) B.putByteArray("SignHashes", getSignHashes());
B.putInt("SignedHashes", getSignedHashes());
B.putString("Wallet", wallet);
B.putString("Error", error);
B.putBoolean("WalletPublicKeyValid", isWalletPublicKeyValid());
@ -1434,7 +1434,7 @@ public class TangemCard {
else
encryptionMode = null;
if(B.containsKey("SignHashes")) setSignHashes(B.getByteArray("SignHashes"));
if(B.containsKey("SignedHashes")) setSignedHashes(B.getInt("SignedHashes"));
if(B.containsKey("FailedBalance")) failedBalanceRequestCounter = new AtomicInteger(B.getInt("FailedBalance"));
if (B.containsKey("Issuer")) issuer = Issuer.FindIssuer(B.getString("Issuer"));