diff options
| author | Yosuke Iwakura <yosuke.iwakura@sony.com> | 2018-02-09 18:08:35 +0900 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2018-03-05 10:18:48 -0800 |
| commit | e203d59e3de287889ff65a79abbcd74fd8e5c3b5 (patch) | |
| tree | f3b4edbd7332ac295418816d5d5546c3dacfbaee | |
| parent | 9f3b476d2acf111e289d9a5979fed76d88ce4eba (diff) | |
| download | SecureElement-e203d59e3de287889ff65a79abbcd74fd8e5c3b5.tar.gz | |
Search for rule with specific AID but for other hash
It must be possible to search the access rule cache for a rule that
contains the requested AID but with another specific hash value. Global
Platform SEAC Device Side Test Plan TC 4.1 (c0-ee-09) fails as no REF_DO
is found in the access rule cache if this fix is not applied.
Bug: 73786675
Bug: 73133863
Test: Confirmed that the TC 4.1 above can pass with this change.
Merged-In: I3965d481d07272c16c86240b901045316847719c
Change-Id: I3965d481d07272c16c86240b901045316847719c
| -rw-r--r-- | src/com/android/se/security/AccessRuleCache.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/se/security/AccessRuleCache.java b/src/com/android/se/security/AccessRuleCache.java index 5ae9ee8..c63077d 100644 --- a/src/com/android/se/security/AccessRuleCache.java +++ b/src/com/android/se/security/AccessRuleCache.java @@ -399,9 +399,9 @@ public class AccessRuleCache { if (aidRefDo == null) { return null; } - // C0 00 is specific -> default AID - // 4F 00 is NOT specific -> all AIDs - if (aidRefDo.getTag() == AID_REF_DO.TAG || aidRefDo.getAid().length == 0) { + + // The specified AID_REF_DO does not have any AID and it is not for the default AID. + if (aidRefDo.getTag() == AID_REF_DO.TAG && aidRefDo.getAid().length == 0) { return null; } |