commit 8079cfe99bc067491fd82efd22953daadb17e53b
author Yan, Shaopu <shaopu.yan@intel.com> Mon Aug 13 08:36:31 2018 +0800
committer Yan, Shaopu <shaopu.yan@intel.com> Tue Aug 21 15:23:15 2018 +0800
tree bdcbfdfe24c772e0de9ee5b2fe7708f5f7441ac0
parent 821acb74d7febb886a9b7cefee4ee3df4cc8c556

fix the wrong index issue in AuthProxy operator

details:
the caller want to scan both hw_enforced and sw_enforced list, however
the original check of the pos index has issue which will lost the sw_enforced.

Change-Id: I6e7abc1d0c6d20d7cad3b40aa73b18d2610f577b

include/keymaster/authorization_set.h

diff --git a/include/keymaster/authorization_set.h b/include/keymaster/authorization_set.h
index fec3d46..30b978f 100644
--- a/include/keymaster/authorization_set.h
+++ b/include/keymaster/authorization_set.h
@@ -711,7 +711,9 @@
 
     keymaster_key_param_t operator[](size_t pos) const {
         if (pos < hw_enforced_.size()) return hw_enforced_[pos];
-        if (pos < sw_enforced_.size()) return sw_enforced_[pos - hw_enforced_.size()];
+        if ((pos - hw_enforced_.size()) < sw_enforced_.size()) {
+            return sw_enforced_[pos - hw_enforced_.size()];
+        }
         return {};
     }