Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Unified Diff: media/cast/audio_sender/audio_sender.cc

Issue 62843002: Cast: Added support for AES-CTR crypto. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/audio_sender/audio_sender.cc
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/audio_sender/audio_sender.cc
index 560ebd990ccaf094ffbd41726762e9978c16a6aa..6c05044284fb9f79783125f7056209af71de1837 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/audio_sender/audio_sender.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
+#include "crypto/symmetric_key.h"
#include "media/cast/audio_sender/audio_encoder.h"
#include "media/cast/rtcp/rtcp.h"
#include "media/cast/rtp_sender/rtp_sender.h"
@@ -93,6 +94,18 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
audio_config.sender_ssrc,
audio_config.rtcp_c_name),
weak_factory_(this) {
+ if (audio_config.aes_iv_mask.size() == kAesKeySize &&
+ audio_config.aes_key.size() == kAesKeySize) {
+ iv_mask_ = audio_config.aes_iv_mask;
+ crypto::SymmetricKey* key = crypto::SymmetricKey::Import(
+ crypto::SymmetricKey::AES, audio_config.aes_key);
+ encryptor_.reset(new crypto::Encryptor());
+ encryptor_->Init(key, crypto::Encryptor::CTR, std::string());
+ } else if (audio_config.aes_iv_mask.size() != 0 ||
+ audio_config.aes_key.size() != 0) {
+ DCHECK(false) << "Invalid crypto configuration";
+ }
+
rtcp_.SetRemoteSSRC(audio_config.incoming_feedback_ssrc);
if (!audio_config.use_external_encoder) {
@@ -119,14 +132,48 @@ void AudioSender::InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
const base::TimeTicks& recorded_time,
const base::Closure callback) {
DCHECK(audio_encoder_.get() == NULL) << "Invalid internal state";
- rtp_sender_.IncomingEncodedAudioFrame(audio_frame, recorded_time);
+
+ if (encryptor_) {
+ EncodedAudioFrame encrypted_frame;
+ if (EncryptAudioFrame(audio_frame, &encrypted_frame)) {
+ rtp_sender_.IncomingEncodedAudioFrame(&encrypted_frame, recorded_time);
+ } else {
+ DCHECK(false) << "Encryption error";
+ return;
+ }
+ } else {
+ rtp_sender_.IncomingEncodedAudioFrame(audio_frame, recorded_time);
+ }
callback.Run();
}
+bool AudioSender::EncryptAudioFrame(const EncodedAudioFrame* audio_frame,
+ EncodedAudioFrame* encrypted_frame) {
+ DCHECK(encryptor_) << "Invalid state";
+
+ encryptor_->SetCounter(GetAesNounce(audio_frame->frame_id, iv_mask_));
+
+ encrypted_frame->codec = audio_frame->codec;
+ encrypted_frame->frame_id = audio_frame->frame_id;
+ encrypted_frame->samples = audio_frame->samples;
+
+ return encryptor_->Encrypt(audio_frame->data, &encrypted_frame->data);
+}
+
void AudioSender::SendEncodedAudioFrame(
scoped_ptr<EncodedAudioFrame> audio_frame,
const base::TimeTicks& recorded_time) {
- rtp_sender_.IncomingEncodedAudioFrame(audio_frame.get(), recorded_time);
+ if (encryptor_) {
+ EncodedAudioFrame encrypted_frame;
+ if (EncryptAudioFrame(audio_frame.get(), &encrypted_frame)) {
+ rtp_sender_.IncomingEncodedAudioFrame(&encrypted_frame, recorded_time);
+ } else {
+ DCHECK(false) << "Encryption error";
+ return;
+ }
+ } else {
+ rtp_sender_.IncomingEncodedAudioFrame(audio_frame.get(), recorded_time);
+ }
}
void AudioSender::ResendPackets(

Powered by Google App Engine
This is Rietveld 408576698