a2e15186e5
This merges the following changes from the Widevine CDM repository:
da001b6 Add Privacy mode and service certificate
This adds support to the CDM for privacy mode and service certificates.
92bf200 Add support for using Youtube Content Protection server for testing
Enables testing with Youtube Content Protection server. Google Play license
server is still the default. Select YTCP server by using the flag -icp
e.g. adb shell '/system/bin/request_license_test -icp'
85dcd60 Fixes to enable privacy mode
These includes changes to use PKCS7 padding, corrected root CA formatting
and changes to integration test. Also refactored service certificate
handling.
989971c Correction to request license test
Corrected PropertySetTest to provision when needed. Also added disabled
privacy tests to run against YTCP staging server until GooglePlay
integration is complete.
Bug: 10109249
Change-Id: If81d68c65d743d77a485406f48d1be41a74de0af
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
// Copyright 2013 Google Inc. All Rights Reserved.
|
|
|
|
#ifndef CDM_TEST_URL_REQUEST_H_
|
|
#define CDM_TEST_URL_REQUEST_H_
|
|
|
|
#include <string>
|
|
#include "http_socket.h"
|
|
#include "wv_cdm_types.h"
|
|
|
|
namespace wvcdm {
|
|
|
|
// Provides simple HTTP request and response service.
|
|
// Only POST request method is implemented.
|
|
class UrlRequest {
|
|
public:
|
|
UrlRequest(const std::string& url, const std::string& port,
|
|
bool secure_connect, bool chunk_transfer_mode);
|
|
~UrlRequest();
|
|
|
|
void AppendChunkToUpload(const std::string& data);
|
|
void ConcatenateChunkedResponse(const std::string http_response,
|
|
std::string* modified_response);
|
|
int GetResponse(std::string* message);
|
|
int GetStatusCode(const std::string& response);
|
|
bool is_connected() const { return is_connected_; }
|
|
bool PostRequest(const std::string& data);
|
|
bool PostRequestChunk(const std::string& data);
|
|
bool PostCertRequestInQueryString(const std::string& data);
|
|
|
|
private:
|
|
static const unsigned int kHttpBufferSize = 4096;
|
|
char buffer_[kHttpBufferSize];
|
|
bool chunk_transfer_mode_;
|
|
bool is_connected_;
|
|
std::string port_;
|
|
std::string request_;
|
|
HttpSocket socket_;
|
|
std::string server_url_;
|
|
|
|
CORE_DISALLOW_COPY_AND_ASSIGN(UrlRequest);
|
|
};
|
|
|
|
}; // namespace wvcdm
|
|
|
|
#endif // CDM_TEST_URL_REQUEST_H_
|