Source release 18.7.0
This commit is contained in:
@@ -10,7 +10,9 @@
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "log.h"
|
||||
#include "oec_test_data.h"
|
||||
#include "string_conversions.h"
|
||||
#include "test_sleep.h"
|
||||
|
||||
namespace wvoec {
|
||||
@@ -68,6 +70,12 @@ void DeviceFeatures::Initialize() {
|
||||
provisioning_method == OEMCrypto_BootCertificateChain ||
|
||||
provisioning_method == OEMCrypto_DrmReprovisioning;
|
||||
printf("loads_certificate = %s.\n", loads_certificate ? "true" : "false");
|
||||
if (rsa_test_key().empty()) {
|
||||
set_rsa_test_key(
|
||||
std::vector<uint8_t>(kTestRSAPKCS8PrivateKeyInfo2_2048,
|
||||
kTestRSAPKCS8PrivateKeyInfo2_2048 +
|
||||
sizeof(kTestRSAPKCS8PrivateKeyInfo2_2048)));
|
||||
}
|
||||
generic_crypto =
|
||||
(OEMCrypto_ERROR_NOT_IMPLEMENTED !=
|
||||
OEMCrypto_Generic_Encrypt(buffer, 0, buffer, 0, iv,
|
||||
@@ -129,6 +137,9 @@ void DeviceFeatures::Initialize() {
|
||||
case LOAD_TEST_RSA_KEY:
|
||||
printf("LOAD_TEST_RSA_KEY: Call LoadTestRSAKey before deriving keys.\n");
|
||||
break;
|
||||
case PRELOADED_RSA_KEY:
|
||||
printf("PRELOADED_RSA_KEY: Device has test RSA key baked in.\n");
|
||||
break;
|
||||
case TEST_PROVISION_30:
|
||||
printf("TEST_PROVISION_30: Device provisioned with OEM Cert.\n");
|
||||
break;
|
||||
@@ -175,9 +186,10 @@ void DeviceFeatures::PickDerivedKey() {
|
||||
return;
|
||||
case OEMCrypto_DrmCertificate:
|
||||
case OEMCrypto_DrmReprovisioning:
|
||||
if (OEMCrypto_ERROR_NOT_IMPLEMENTED != OEMCrypto_LoadTestRSAKey()) {
|
||||
derive_key_method = LOAD_TEST_RSA_KEY;
|
||||
}
|
||||
derive_key_method =
|
||||
(OEMCrypto_ERROR_NOT_IMPLEMENTED == OEMCrypto_LoadTestRSAKey())
|
||||
? PRELOADED_RSA_KEY
|
||||
: LOAD_TEST_RSA_KEY;
|
||||
return;
|
||||
case OEMCrypto_Keybox:
|
||||
if (OEMCrypto_ERROR_NOT_IMPLEMENTED !=
|
||||
|
||||
Reference in New Issue
Block a user