| Index: media/cast/common/transport_encryption_handler.cc
|
| diff --git a/media/cast/common/transport_encryption_handler.cc b/media/cast/common/transport_encryption_handler.cc
|
| index 360e40c63a8c48833bc35718842e0cc379e606a9..b0b2f968fd1a46b0a916621c58015fa67d499a8b 100644
|
| --- a/media/cast/common/transport_encryption_handler.cc
|
| +++ b/media/cast/common/transport_encryption_handler.cc
|
| @@ -15,7 +15,7 @@ namespace {
|
| const size_t kAesBlockSize = 16;
|
| const size_t kAesKeySize = 16;
|
|
|
| -std::string GetAesNonce(uint32 frame_id, const std::string& iv_mask) {
|
| +std::string GetAesNonce(uint32_t frame_id, const std::string& iv_mask) {
|
| std::string aes_nonce(kAesBlockSize, 0);
|
|
|
| // Serializing frame_id in big-endian order (aes_nonce[8] is the most
|
| @@ -61,7 +61,7 @@ bool TransportEncryptionHandler::Initialize(const std::string& aes_key,
|
| return true;
|
| }
|
|
|
| -bool TransportEncryptionHandler::Encrypt(uint32 frame_id,
|
| +bool TransportEncryptionHandler::Encrypt(uint32_t frame_id,
|
| const base::StringPiece& data,
|
| std::string* encrypted_data) {
|
| if (!is_activated_)
|
| @@ -77,7 +77,7 @@ bool TransportEncryptionHandler::Encrypt(uint32 frame_id,
|
| return true;
|
| }
|
|
|
| -bool TransportEncryptionHandler::Decrypt(uint32 frame_id,
|
| +bool TransportEncryptionHandler::Decrypt(uint32_t frame_id,
|
| const base::StringPiece& ciphertext,
|
| std::string* plaintext) {
|
| if (!is_activated_) {
|
|
|