2af5dcbe9e
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be. Reason for revert: This wasn't the cause of the break. Original change's description: > Revert "Refactor FrameDecryptorInterface::Decrypt to use new API." > > This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195. > > Reason for revert: Speculative revert. The chromium roll is failing: > https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388 > But I can't figure out exactly what is failing, this looks suspecious. > > Original change's description: > > Refactor FrameDecryptorInterface::Decrypt to use new API. > > > > This change refactors the FrameDecryptorInterface to use the new API. The new > > API surface simply moves bytes_written to the return type and implements a > > simple Status type. > > > > Bug: webrtc:10512 > > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460 > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Benjamin Wright <benwright@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27497} > > TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org > > Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10512 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013 > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Commit-Queue: Henrik Boström <hbos@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27510} TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10512 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982 Reviewed-by: Benjamin Wright <benwright@webrtc.org> Commit-Queue: Benjamin Wright <benwright@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27529}
70 lines
2.0 KiB
C++
70 lines
2.0 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/test/fake_frame_decryptor.h"
|
|
#include <vector>
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
FakeFrameDecryptor::FakeFrameDecryptor(uint8_t fake_key,
|
|
uint8_t expected_postfix_byte)
|
|
: fake_key_(fake_key), expected_postfix_byte_(expected_postfix_byte) {}
|
|
|
|
FakeFrameDecryptor::Result FakeFrameDecryptor::Decrypt(
|
|
cricket::MediaType media_type,
|
|
const std::vector<uint32_t>& csrcs,
|
|
rtc::ArrayView<const uint8_t> additional_data,
|
|
rtc::ArrayView<const uint8_t> encrypted_frame,
|
|
rtc::ArrayView<uint8_t> frame) {
|
|
if (fail_decryption_) {
|
|
return Result(Status::kFailedToDecrypt, 0);
|
|
}
|
|
|
|
RTC_CHECK_EQ(frame.size() + 1, encrypted_frame.size());
|
|
for (size_t i = 0; i < frame.size(); i++) {
|
|
frame[i] = encrypted_frame[i] ^ fake_key_;
|
|
}
|
|
|
|
if (encrypted_frame[frame.size()] != expected_postfix_byte_) {
|
|
return Result(Status::kFailedToDecrypt, 0);
|
|
}
|
|
|
|
return Result(Status::kOk, frame.size());
|
|
}
|
|
|
|
size_t FakeFrameDecryptor::GetMaxPlaintextByteSize(
|
|
cricket::MediaType media_type,
|
|
size_t encrypted_frame_size) {
|
|
return encrypted_frame_size - 1;
|
|
}
|
|
|
|
void FakeFrameDecryptor::SetFakeKey(uint8_t fake_key) {
|
|
fake_key_ = fake_key;
|
|
}
|
|
|
|
uint8_t FakeFrameDecryptor::GetFakeKey() const {
|
|
return fake_key_;
|
|
}
|
|
|
|
void FakeFrameDecryptor::SetExpectedPostfixByte(uint8_t expected_postfix_byte) {
|
|
expected_postfix_byte_ = expected_postfix_byte;
|
|
}
|
|
|
|
uint8_t FakeFrameDecryptor::GetExpectedPostfixByte() const {
|
|
return expected_postfix_byte_;
|
|
}
|
|
|
|
void FakeFrameDecryptor::SetFailDecryption(bool fail_decryption) {
|
|
fail_decryption_ = fail_decryption;
|
|
}
|
|
|
|
} // namespace webrtc
|