169d0b6cb6
These are a set of CLs merged from the wv cdm repo to the android repo. * Correct RELEASE_ALL_USAGE_INFO_ERRORs Author: Rahul Frias <rfrias@google.com> [ Merge of http://go/wvgerrit/28742 ] RELEASE_ALL_USAGE_INFO_ERROR_4 and 5 were introduced and made use of in http://go/wvgerrit/24022 (branch: oc-dev). The error code definitions were merged over in http://go/wvgerrit/24602. When http://go/wvgerrit/24622 from cdm_partners_3.2 was merged to master (http://go/wvgerrit/27723) there was conflict in error codes. The error codes were adjusted to RELEASE_ALL_USAGE_INFO_ERROR_3 and 4 and were made use of. To avoid renaming the errors between oc-dev and master, new errors RELEASE_ALL_USAGE_INFO_ERROR_6 and 7 have been added to handle the scenarios noted in the merge from cdm_partner_3.2. The other errors have been reverted back to RELEASE_ALL_USAGE_INFO_ERROR_4 and 5. They will be used when http://go/wvgerrit/24602 is merged. * Address compilation issues Author: Rahul Frias <rfrias@google.com> [ Merge of http://go/wvgerrit/28740 ] These changes enable compilation of most of the cdm code on android expect for OEMCrypto unit tests (b/62739406) on wv master. * Add property for binary/base64 provisioning msgs. Author: Gene Morgan <gmorgan@google.com> [ Merge of http://go/wvgerrit/28074 ] Property is "provisioning_messages_are_binary". Its default setting is false in the CE CDM, but it can be overridden by integrators. Added section to integration guide that discusses Provisioning Server message formats and the new property. Link: https://docs.google.com/document/d/1cBVbhgrajLpDe2W3_vzLzUqzpdDt73chvm4_sZlZlS8/edit#heading=h.hgxw53ddw7jo BUG: 71650075 Test: Not currently passing. Will be addressed in a subsequent commit in the chain. Change-Id: I9168193819974d1ff65d9a94dbd762e45ecc43ca
34 lines
1.2 KiB
C++
34 lines
1.2 KiB
C++
// Copyright 2013 Google Inc. All Rights Reserved.
|
|
|
|
#ifndef CDM_BASE_PROPERTIES_CONFIGURATION_H_
|
|
#define CDM_BASE_PROPERTIES_CONFIGURATION_H_
|
|
|
|
#include "wv_cdm_constants.h"
|
|
#include "properties.h"
|
|
|
|
namespace wvcdm {
|
|
|
|
// Set only one of the three below to true. If secure buffer
|
|
// is selected, fallback to userspace buffers may occur
|
|
// if L1/L2 OEMCrypto APIs fail
|
|
const bool kPropertyOemCryptoUseSecureBuffers = true;
|
|
const bool kPropertyOemCryptoUseFifo = false;
|
|
const bool kPropertyOemCryptoUseUserSpaceBuffers = false;
|
|
|
|
// If false, keyboxes will be used as client identification
|
|
// and passed as the token in the license request
|
|
const bool kPropertyUseCertificatesAsIdentification = true;
|
|
|
|
// If true, provisioning messages will be binary strings (serialized protobuf
|
|
// messages). Otherwise they are base64 (web-safe) encoded, and the response
|
|
// string accepted by the CDM includes the JSON wrapper.
|
|
const bool kPropertyProvisioningMessagesAreBinary = false;
|
|
|
|
// If true, device files will be moved to the directory specified by
|
|
// Properties::GetDeviceFilesBasePath
|
|
const bool kSecurityLevelPathBackwardCompatibilitySupport = true;
|
|
|
|
} // namespace wvcdm
|
|
|
|
#endif // CDM_BASE_WV_PROPERTIES_CONFIGURATION_H_
|