diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-01 12:28:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-01 12:28:36 +0000 |
| commit | 2dd3e0965dc8310487bfda1172d0f60ad1fb218b (patch) | |
| tree | a009be5c15bb50ee8b170bd875595d600eaca4d6 | |
| parent | 1120e08a7b030d3dac25fa954c43ceee0993c1c5 (diff) | |
| parent | 3da21137089e527ab48cbeba6067031e03a969de (diff) | |
| download | SecureElement-2dd3e0965dc8310487bfda1172d0f60ad1fb218b.tar.gz | |
Merge "Fix CLA byte encoded with wrong SM bit" am: 3da2113708
Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1937329
Change-Id: Ia0a43869670309788a08759a409adcc2576f4659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x[-rw-r--r--] | src/com/android/se/Channel.java | 2 | ||||
| -rwxr-xr-x | src/com/android/se/internal/Util.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/se/Channel.java b/src/com/android/se/Channel.java index d6df415..33327ed 100644..100755 --- a/src/com/android/se/Channel.java +++ b/src/com/android/se/Channel.java @@ -213,7 +213,7 @@ public class Channel implements IBinder.DeathRecipient { cla = (byte) ((cla & 0xBC) | channelNumber); } else if (channelNumber < 20) { // b7 = 1 indicates the further interindustry class byte coding - boolean isSm = (cla & 0x0C) != 0; + boolean isSm = (((cla & 0x40) == 0x00) && ((cla & 0x0C) != 0)); cla = (byte) ((cla & 0xB0) | 0x40 | (channelNumber - 4)); if (isSm) { cla |= 0x20; diff --git a/src/com/android/se/internal/Util.java b/src/com/android/se/internal/Util.java index 8e9cfe3..8a52962 100755 --- a/src/com/android/se/internal/Util.java +++ b/src/com/android/se/internal/Util.java @@ -135,7 +135,7 @@ public class Util { cla = (byte) ((cla & 0xBC) | channelNumber); } else if (channelNumber < 20) { // b7 = 1 indicates the further interindustry class byte coding - boolean isSM = (cla & 0x0C) != 0; + boolean isSM = (((cla & 0x40) == 0x00) && ((cla & 0x0C) != 0)); cla = (byte) ((cla & 0xB0) | 0x40 | (channelNumber - 4)); if (isSM) { cla |= 0x20; |