Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77bacb8d authored May 16, 2023 by Andrew Scull Committed by Automerger Merge Worker May 16, 2023

Merge "Add security version to config descriptor" am: 1d23120b am:...

Merge "Add security version to config descriptor" am: 1d23120b am: abf29697 am: 411d1dcc am: 790b5d23

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

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

parents 1e0e4b9b 790b5d23

security/rkp/README.md

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -325,6 +325,11 @@ the range \[-70000, -70999\] (these are reserved for future additions here).
	: : : : boot stage :		: : : : boot stage :
	\| Resettable \| -70004 \| null \| If present, key changes on factory\|		\| Resettable \| -70004 \| null \| If present, key changes on factory\|
	: : : : reset :		: : : : 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		Please see

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -427,6 +427,7 @@ interface IRemotelyProvisionedComponent {
	* ? -70002 : tstr, ; Component name		* ? -70002 : tstr, ; Component name
	* ? -70003 : int / tstr, ; Component version		* ? -70003 : int / tstr, ; Component version
	* ? -70004 : null, ; Resettable		* ? -70004 : null, ; Resettable
			* ? -70005 : uint, ; Security version
	* },		* },
	* -4670549 : bstr, ; Authority Hash		* -4670549 : bstr, ; Authority Hash
	* ? -4670550 : bstr, ; Authority Descriptor		* ? -4670550 : bstr, ; Authority Descriptor