cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SecurityToken: fix TLV in GET DATA fingerprint DO handling

Browse Source
This commit is contained in:
Nikita Mikhailov
2016-05-09 15:27:45 +06:00
parent 9f57a1312e
commit aadc59691b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
View File

@@ -477,10 +477,18 @@ public class SecurityTokenHelper {
String data = "00CA006E00"; String data = "00CA006E00";
byte[] buf = mTransport.transceive(Hex.decode(data)); byte[] buf = mTransport.transceive(Hex.decode(data));
Iso7816TLV tlv = Iso7816TLV.readSingle(buf, true); Iso7816TLV[] tlvs = Iso7816TLV.readList(buf, true);
Log.d(Constants.TAG, "nfcGetFingerprints() Iso7816TLV tlv data:\n" + tlv.prettyPrint()); Iso7816TLV fptlv = null;
for (int i = 0; i < tlvs.length; i++) {
Log.d(Constants.TAG, "nfcGetFingerprints() Iso7816TLV tlv data:\n" + tlvs[i].prettyPrint());
Iso7816TLV tlv = Iso7816TLV.findRecursive(tlvs[i], 0xc5);
if (tlv != null) {
fptlv = tlv;
}
}
Iso7816TLV fptlv = Iso7816TLV.findRecursive(tlv, 0xc5);
if (fptlv == null) { if (fptlv == null) {
return null; return null;
} }