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

Source release 14.2.0

Browse Source
This commit is contained in:
John W. Bruce
2018-10-12 19:55:47 -07:00
parent c32e8d0490
commit f51edaba5a
632 changed files with 196557 additions and 66444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cdm/src/cdm.cpp
View File

@@ -20,6 +20,7 @@
#include "log.h"
#include "metrics_collections.h"
#include "properties.h"
#include "scoped_ptr.h"
#include "service_certificate.h"
#include "string_conversions.h"
#include "wv_cdm_constants.h"
@@ -1123,7 +1124,8 @@ Cdm::Status CdmImpl::decrypt(const InputBuffer& input,
return kSuccess;
}
if (result == NEED_KEY || result == SESSION_NOT_FOUND_FOR_DECRYPT) {
if (result == NEED_KEY || result == KEY_NOT_FOUND_3 ||
result == SESSION_NOT_FOUND_FOR_DECRYPT) {
LOGE("Key not available.");
return kNoKey;
}
@@ -1409,8 +1411,9 @@ Cdm::Status CdmImpl::ConvertHdcpLevel(const std::string& query_value,
bool VerifyL1() {
metrics::CryptoMetrics throwaway_metrics;
CryptoSession cs(&throwaway_metrics);
return cs.GetSecurityLevel() == kSecurityLevelL1;
scoped_ptr<CryptoSession> cs(
CryptoSession::MakeCryptoSession(&throwaway_metrics));
return cs->GetSecurityLevel() == kSecurityLevelL1;
}
} // namespace