Cast: Added support for AES-CTR crypto.

media/cast/video_sender/video_sender.cc

Index: media/cast/video_sender/video_sender.cc
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index 52fa3e26252087d0ddba3fd9e160feb176bb3e55..3fc03419a5868bf3142a0eeb95290878f2024228 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "crypto/symmetric_key.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/video_sender/video_encoder.h"
@@ -109,6 +110,20 @@ VideoSender::VideoSender(
         max_unacked_frames_);
     video_encoder_controller_ = video_encoder_.get();
   }
+
+  if (video_config.aes_iv_mask.size() == kAesBlockSize * 2 &&
+      video_config.aes_key.size() == kAesBlockSize * 2) {
+    iv_mask_ = ConvertFromBase16String(video_config.aes_iv_mask);
+    crypto::SymmetricKey* key = crypto::SymmetricKey::Import(
+        crypto::SymmetricKey::AES,
+        ConvertFromBase16String(video_config.aes_key));

[Alpha Left Google, 2013/11/07 01:10:11]

Again don't do the conversion here.

[pwestin, 2013/11/07 17:16:04]

Done.

+    encryptor_.reset(new crypto::Encryptor());
+    encryptor_->Init(key, crypto::Encryptor::CTR, std::string());
+  } else if (video_config.aes_iv_mask.size() != 0 ||
+             video_config.aes_iv_mask.size() != 0) {
+    DCHECK(false) << "Invalid crypto configuration";
+  }
+
   rtcp_.reset(new Rtcp(
       cast_environment_->Clock(),
       rtcp_feedback_.get(),
@@ -143,7 +158,7 @@ void VideoSender::InsertRawVideoFrame(
   }
 }
 
-void VideoSender::InsertCodedVideoFrame(const EncodedVideoFrame* encoded_frame,
+void VideoSender::InsertCodedVideoFrame(EncodedVideoFrame* encoded_frame,
                                         const base::TimeTicks& capture_time,
                                         const base::Closure callback) {
   DCHECK(!video_encoder_.get()) << "Invalid state";
@@ -159,10 +174,38 @@ void VideoSender::SendEncodedVideoFrameMainThread(
   SendEncodedVideoFrame(video_frame.get(), capture_time);
 }
 
-void VideoSender::SendEncodedVideoFrame(const EncodedVideoFrame* encoded_frame,
+bool VideoSender::EncryptVideoFrame(const EncodedVideoFrame* video_frame,
+                                    EncodedVideoFrame* encrypted_frame) {
+  DCHECK(encryptor_) << "Invalid state";
+
+  encryptor_->SetCounter(GetAesNounce(video_frame->frame_id, iv_mask_));
+
+  encrypted_frame->codec = video_frame->codec;
+  encrypted_frame->key_frame = video_frame->key_frame;
+  encrypted_frame->frame_id = video_frame->frame_id;
+  encrypted_frame->last_referenced_frame_id =
+      video_frame->last_referenced_frame_id;
+
+  return encryptor_->Encrypt(video_frame->data, &encrypted_frame->data);
+}
+
+void VideoSender::SendEncodedVideoFrame(EncodedVideoFrame* encoded_frame,
                                         const base::TimeTicks& capture_time) {
   last_send_time_ = cast_environment_->Clock()->NowTicks();
-  rtp_sender_->IncomingEncodedVideoFrame(encoded_frame, capture_time);
+
+  if (encryptor_) {
+    EncodedVideoFrame encrypted_video_frame;
+
+    if (EncryptVideoFrame(encoded_frame, &encrypted_video_frame)) {
+      rtp_sender_->IncomingEncodedVideoFrame(&encrypted_video_frame,
+                                             capture_time);
+    } else {
+      DCHECK(false) << "Encryption error";
+      return;
+    }
+  } else {
+    rtp_sender_->IncomingEncodedVideoFrame(encoded_frame, capture_time);
+  }
   if (encoded_frame->key_frame) {
     VLOG(1) << "Send encoded key frame; frame_id:"
             << static_cast<int>(encoded_frame->frame_id);