commit 1c91d9ccdc4b2517f6afdcbba7a08fb3c3f6a2b1
author Andrew Scull <ascull@google.com> Wed Sep 20 18:55:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 20 18:55:10 2023 +0000
tree ada2f2fe557c3c1b88e26e2db3dbff9b892f1c3f
parent 1dc9c9f7a2d81a54c661e9d1cadf2e0ff5442bf4
parent 95318f2960dbaa48aae4b51457f4a5abaf425d05

Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev

security/rkp/README.md

diff --git a/security/rkp/README.md b/security/rkp/README.md
index 7477f80..5a93734 100644
--- a/security/rkp/README.md
+++ b/security/rkp/README.md
@@ -324,6 +324,11 @@
 :                   :        :            : boot stage                        :
 | Resettable        | -70004 | null       | If present, key changes on factory|
 :                   :        :            : reset                             :
+| Security version  | -70005 | uint       | Machine-comparable, monotonically |
+:                   :        :            : increasing version of the firmware:
+:                   :        :            : component / boot stage where a    :
+:                   :        :            : greater value indicates a newer   :
+:                   :        :            : version                           :
 ```
 
 Please see

security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl

diff --git a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
index 2a4cba1..7fed363 100644
--- a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
+++ b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
@@ -427,6 +427,7 @@
      *         ? -70002 : tstr,                         ; Component name
      *         ? -70003 : int / tstr,                   ; Component version
      *         ? -70004 : null,                         ; Resettable
+     *         ? -70005 : uint,                         ; Security version
      *     },
      *     -4670549 : bstr,                         ; Authority Hash
      *     ? -4670550 : bstr,                       ; Authority Descriptor