diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 0cbe5f1a..c661f0cd 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -146,8 +146,6 @@ typedef OEMCryptoResult (*L1_GetDeviceID_t)(uint8_t* deviceID, size_t* idLength); typedef OEMCryptoResult (*L1_GetKeyData_t)(uint8_t* keyData, size_t* keyDataLength); -typedef OEMCryptoResult (*L1_GetRandom_t)(uint8_t* randomData, - size_t dataLength); typedef OEMCryptoResult (*L1_LoadDeviceRSAKey_t)(OEMCrypto_SESSION session, const uint8_t* wrapped_rsa_key, size_t wrapped_rsa_key_length); @@ -383,7 +381,6 @@ struct FunctionPointers { L1_IsKeyboxOrOEMCertValid_t IsKeyboxOrOEMCertValid; L1_GetDeviceID_t GetDeviceID; L1_GetKeyData_t GetKeyData; - L1_GetRandom_t GetRandom; L1_LoadDeviceRSAKey_t LoadDeviceRSAKey; L1_LoadDRMPrivateKey_t LoadDRMPrivateKey; L1_LoadTestRSAKey_t LoadTestRSAKey; @@ -1013,7 +1010,6 @@ class Adapter { LOOKUP_ALL(16, LoadOEMPrivateKey, OEMCrypto_LoadOEMPrivateKey); LOOKUP_ALL(12, GetProvisioningMethod, OEMCrypto_GetProvisioningMethod); LOOKUP_ALL(19, GetBCCType, OEMCrypto_GetBCCType); - LOOKUP_ALL( 8, GetRandom, OEMCrypto_GetRandom); LOOKUP_ALL( 8, InstallKeyboxOrOEMCert, OEMCrypto_InstallKeyboxOrOEMCert); LOOKUP_ALL(18, FactoryInstallBCCSignature, OEMCrypto_FactoryInstallBCCSignature); LOOKUP_ALL(10, IsAntiRollbackHwPresent, OEMCrypto_IsAntiRollbackHwPresent); @@ -1136,7 +1132,6 @@ class Adapter { level3_.IsKeyboxOrOEMCertValid = Level3_IsKeyboxOrOEMCertValid; level3_.GetDeviceID = Level3_GetDeviceID; level3_.GetKeyData = Level3_GetKeyData; - level3_.GetRandom = Level3_GetRandom; level3_.LoadDRMPrivateKey = Level3_LoadDRMPrivateKey; level3_.LoadOEMPrivateKey = Level3_LoadOEMPrivateKey; level3_.LoadTestRSAKey = Level3_LoadTestRSAKey; @@ -2472,15 +2467,6 @@ extern "C" OEMCryptoResult OEMCrypto_GetKeyData(uint8_t* keyData, return OEMCrypto_GetKeyData(keyData, keyDataLength, kLevelDefault); } -extern "C" OEMCryptoResult OEMCrypto_GetRandom(uint8_t* randomData, - size_t dataLength) { - if (!gAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE; - const FunctionPointers* fcn = gAdapter->GetFunctionPointers(kLevelDefault); - if (!fcn) return OEMCrypto_ERROR_INVALID_SESSION; - if (fcn->GetRandom == nullptr) return OEMCrypto_ERROR_NOT_IMPLEMENTED; - return fcn->GetRandom(randomData, dataLength); -} - extern "C" OEMCryptoResult OEMCrypto_LoadProvisioning( OEMCrypto_SESSION session, const uint8_t* request, size_t request_length, const uint8_t* message, size_t message_length, size_t core_message_length, diff --git a/libwvdrmengine/oemcrypto/include/level3.h b/libwvdrmengine/oemcrypto/include/level3.h index 4dbeee67..8b65a270 100644 --- a/libwvdrmengine/oemcrypto/include/level3.h +++ b/libwvdrmengine/oemcrypto/include/level3.h @@ -25,7 +25,6 @@ #define Level3_InstallKeyboxOrOEMCert _lcc03 #define Level3_GetKeyData _lcc04 #define Level3_IsKeyboxOrOEMCertValid _lcc05 -#define Level3_GetRandom _lcc06 #define Level3_GetDeviceID _lcc07 #define Level3_WrapKeyboxOrOEMCert _lcc08 #define Level3_OpenSession _lcc09 @@ -132,7 +131,6 @@ #define Level3_InstallKeyboxOrOEMCert _oecc03 #define Level3_GetKeyData _oecc04 #define Level3_IsKeyboxOrOEMCertValid _oecc05 -#define Level3_GetRandom _oecc06 #define Level3_GetDeviceID _oecc07 #define Level3_WrapKeyboxOrOEMCert _oecc08 #define Level3_OpenSession _oecc09 @@ -207,7 +205,7 @@ #define Level3_ReassociateEntitledKeySession _oecc119 #define Level3_LoadCasECMKeys _oecc120 #define Level3_LoadEntitledContentKeys _oecc121 // place holder for v17. -#define Level3_ProductionReady _oecc122 +#define Level3_ProductionReady _oecc122 #define Level3_Idle _oecc123 #define Level3_Wake _oecc124 #define Level3_BuildInformation _oecc125 @@ -275,7 +273,6 @@ OEMCryptoResult Level3_GetOEMPublicCertificate(uint8_t* public_cert, size_t* public_cert_length); OEMCryptoResult Level3_GetDeviceID(uint8_t* deviceID, size_t* idLength); OEMCryptoResult Level3_GetKeyData(uint8_t* keyData, size_t* keyDataLength); -OEMCryptoResult Level3_GetRandom(uint8_t* randomData, size_t dataLength); OEMCryptoResult Level3_LoadOEMPrivateKey(OEMCrypto_SESSION session); OEMCryptoResult Level3_LoadDRMPrivateKey(OEMCrypto_SESSION session, OEMCrypto_PrivateKeyType key_type,