diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2016-08-04 14:28:40 -0700 |
|---|---|---|
| committer | Jakub Pawlowski <jpawlowski@google.com> | 2016-08-19 13:02:24 +0000 |
| commit | 45059ca6092fbcd7058db16264a62ffa357fefc0 (patch) | |
| tree | 0a8f8dacffd30df6fc48fc2121e7052b42c4ee21 | |
| parent | 1ff09042e0f95cd4adcca60a250a80f1638703ac (diff) | |
| download | android_packages_apps_Nfc-45059ca6092fbcd7058db16264a62ffa357fefc0.tar.gz android_packages_apps_Nfc-45059ca6092fbcd7058db16264a62ffa357fefc0.tar.bz2 android_packages_apps_Nfc-45059ca6092fbcd7058db16264a62ffa357fefc0.zip | |
Fix Bluetooth OOB data parsing
In some early implementations of OOB, TK was send in bad, reversed
order, and was implemented in such way. This patch fixes that.
Bug: 30675596
Change-Id: Id6af6d96cd35ef118372319bab39862ba0501f29
| -rw-r--r-- | src/com/android/nfc/handover/HandoverDataParser.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/nfc/handover/HandoverDataParser.java b/src/com/android/nfc/handover/HandoverDataParser.java index eb77aaad..2921c679 100644 --- a/src/com/android/nfc/handover/HandoverDataParser.java +++ b/src/com/android/nfc/handover/HandoverDataParser.java @@ -443,15 +443,8 @@ public class HandoverDataParser { break; } - byte[] reversedTK = new byte[len - 1]; - payload.get(reversedTK); - byte[] securityManagerTK = new byte[len - 1]; - - //TK in AD is in reverse order - for (int i = 0; i < reversedTK.length; i++) { - securityManagerTK[i] = reversedTK[securityManagerTK.length - 1 - i]; - } + payload.get(securityManagerTK); result.oobData = new OobData(); result.oobData.setSecurityManagerTk(securityManagerTK); |