Merge "Fix for concurrent provisioning attempts" into mnc-dev

2015-06-15 17:29:39 +00:00
parent 6dbc3749b0 b33298a742
commit 1b88e370cf
6 changed files with 38 additions and 11 deletions
--- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h
@@ -83,7 +83,7 @@ enum CdmResponseType {
  EMPTY_LICENSE_REQUEST,
  EMPTY_LICENSE_RESPONSE_1,
  EMPTY_LICENSE_RESPONSE_2,
-  EMPTY_PROVISIONING_CERTIFICATE,
+  EMPTY_PROVISIONING_CERTIFICATE_1,
  EMPTY_PROVISIONING_RESPONSE,
  EMPTY_SESSION_ID,
  GENERATE_DERIVED_KEYS_ERROR,
@@ -186,6 +186,7 @@ enum CdmResponseType {
  CLIENT_ID_RSA_INIT_ERROR,
  CLIENT_ID_RSA_ENCRYPT_ERROR,
  INVALID_QUERY_STATUS,
+  EMPTY_PROVISIONING_CERTIFICATE_2,
 };

 enum CdmKeyStatus {