widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OEMCrypto_GetDeviceInformation() doc

Browse Source 
Add canonicalization requirements and a few more required fields.
Fixed a few typos.

Bug: 314882572
Change-Id: I3fe74c5b78292378fe146afa7236ece2c30942ae
This commit is contained in:
Cong Lin
2023-12-05 13:49:16 -08:00
committed by Robert Shih
parent 9e26c42882
commit 8fe7612f2b
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
View File

@@ -321,8 +321,8 @@ typedef struct {
typedef struct { typedef struct {
size_t num_bytes_clear; // Number of bytes in the unprotected region. size_t num_bytes_clear; // Number of bytes in the unprotected region.
size_t num_bytes_encrypted; // Number of bytes in the protected region. size_t num_bytes_encrypted; // Number of bytes in the protected region.
uint8_t subsample_flags; // is this the first/last subsample in a sample? uint8_t subsample_flags; // is this the first/last subsample in a sample?
size_t block_offset; // used for CTR "cenc" mode only. size_t block_offset; // used for CTR "cenc" mode only.
} OEMCrypto_SubSampleDescription; } OEMCrypto_SubSampleDescription;
#define OEMCrypto_FirstSubsample 1 #define OEMCrypto_FirstSubsample 1
@@ -3175,7 +3175,7 @@ OEMCryptoResult OEMCrypto_GetKeyData(uint8_t* key_data,
* This is an "Initialization and Termination Function" and will not be * This is an "Initialization and Termination Function" and will not be
* called simultaneously with any other function, as if the CDM holds a write * called simultaneously with any other function, as if the CDM holds a write
* lock on the OEMCrypto system. It is called after OEMCrypto_Initialize() and * lock on the OEMCrypto system. It is called after OEMCrypto_Initialize() and
* after OEMCrypto_GetProvisioningMethod() and only if the provisoining method * after OEMCrypto_GetProvisioningMethod() and only if the provisioning method
* is OEMCrypto_Keybox, * is OEMCrypto_Keybox,
* *
* @version * @version
@@ -5043,16 +5043,20 @@ OEMCryptoResult OEMCrypto_GenerateCertificateKeyPair(
OEMCrypto_PrivateKeyType* key_type); OEMCrypto_PrivateKeyType* key_type);
/** /**
* Get the serialized device information in CBOR map format. This is for devices * Get the serialized device information in CBOR map format. The CBOR map must
* that use Provisioning 4.0, with the device key uploading option in the * be canonicalized before serialization according to the specification in RFC
* factory. * 7049:
* 1) If two keys have different lengths, the shorter one sorts earlier.
* 2) If two keys have the same length, the one with the lower value in
* (byte-wise) lexical order sorts earlier.
* This is for devices that use Provisioning 4.0, with the device key uploading
* option in the factory.
* *
* The device * The device information may contain, for example, device make and model,
* information may contain, for example, device make and model, "fused" status, * "fused" status, and other properties, which is intended to be 1) uploaded
* and other properties, which is intended to be 1) uploaded during device * during device manufacture in the factory, 2) checked by the server to verify
* manufacture in the factory, 2) checked by the server to verify that the * that the provisioning request is coming from the expected device in the
* provisioning request is coming from the expected device in the fields, based * fields, based on the values previously uploaded and registered.
* on the values previously uploaded and registered.
* *
* Devices that do not support Provisioning 4.0, or do not support * Devices that do not support Provisioning 4.0, or do not support
* Provisioning 4.0 Uploading Option should return * Provisioning 4.0 Uploading Option should return
@@ -5110,7 +5114,8 @@ OEMCryptoResult OEMCrypto_GetDeviceInformation(uint8_t* device_info,
* the input |encoded_device_info|. DeviceInfo must be canonicalized according * the input |encoded_device_info|. DeviceInfo must be canonicalized according
* to the specification in RFC 7049. The required fields from DeviceInfo.aidl * to the specification in RFC 7049. The required fields from DeviceInfo.aidl
* are: brand, manufacturer, product, model, device, vb_state, bootloader_state, * are: brand, manufacturer, product, model, device, vb_state, bootloader_state,
* vbmeta_digest, security_level. * vbmeta_digest, system_patch_level, boot_patch_level, vendor_patch_level,
* security_level, fused.
* *
* Once CsrPayload is prepared, together with |challenge| it is signed by the * Once CsrPayload is prepared, together with |challenge| it is signed by the
* leaf cert of BCC, in the format of: * leaf cert of BCC, in the format of:
@@ -5489,16 +5494,16 @@ OEMCryptoResult OEMCrypto_FreeSecureBuffer(
* same. Differences in only the |minor| fields indicates that the protocols * same. Differences in only the |minor| fields indicates that the protocols
* are different but are still compatible. * are different but are still compatible.
* *
* @param[in,out] ree_major: pointer to memory to recieve the REE's |major| * @param[in,out] ree_major: pointer to memory to receive the REE's |major|
* version. On input, *ree_major may be zero to request the serialization * version. On input, *ree_major may be zero to request the serialization
* version of the REE. If *ree_major is non-zero, this function will test the * version of the REE. If *ree_major is non-zero, this function will test the
* TEE's compatibility using the specified REE major version. * TEE's compatibility using the specified REE major version.
* @param[in,out] ree_minor: pointer to memory to recieve the REE's |minor| * @param[in,out] ree_minor: pointer to memory to receive the REE's |minor|
* version. On input, *ree_minor may be zero to request the serialization * version. On input, *ree_minor may be zero to request the serialization
* version of the REE. If *ree_minor is non-zero, this function will test the * version of the REE. If *ree_minor is non-zero, this function will test the
* TEE's compatibility using the specified REE minor version. * TEE's compatibility using the specified REE minor version.
* @param[out] tee_major: pointer to memory to recieve the TEE's |major| version * @param[out] tee_major: pointer to memory to receive the TEE's |major| version
* @param[out] tee_minor: pointer to memory to recieve the TEE's |minor| version * @param[out] tee_minor: pointer to memory to receive the TEE's |minor| version
* *
* @retval OEMCrypto_SUCCESS success * @retval OEMCrypto_SUCCESS success
* @retval OPK_ERROR_INCOMPATIBLE_VERSION * @retval OPK_ERROR_INCOMPATIBLE_VERSION