commit 411d1dcc5daf24a9d83ea6c3a23bdfadd76d4452
author Andrew Scull <ascull@google.com> Mon May 15 23:55:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 15 23:55:02 2023 +0000
tree a21978389ac91bd7a73a79204442fc91b74c2c13
parent 239b468f305c4ec95eca9514817328c446c89106
parent abf2969751beda0fee15333fc5d8536116451676

Merge "Add security version to config descriptor" am: 1d23120bad am: abf2969751

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587032

Change-Id: I397fd98f237a2c9a8d54639da61c159bb16a8303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

security/rkp/README.md

diff --git a/security/rkp/README.md b/security/rkp/README.md
index ab767d6..a966141 100644
--- a/security/rkp/README.md
+++ b/security/rkp/README.md
@@ -325,6 +325,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