Update WebRTC to build against libsrtp 2.0

webrtc/pc/externalhmac.cc

 /*
  *  Copyright 2014 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.
  */
 
-#if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
-
 #include "webrtc/pc/externalhmac.h"
 
 #include <stdlib.h>  // For malloc/free.
 
+#ifdef HAVE_SRTP
 extern "C" {
 #ifdef SRTP_RELATIVE_PATH
 #include "crypto_kernel.h"  // NOLINT
 #include "srtp.h"  // NOLINT
 #else
-#include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h"
-#include "third_party/libsrtp/srtp/include/srtp.h"
+#include "third_party/libsrtp/crypto/include/crypto_kernel.h"
+#include "third_party/libsrtp/include/srtp.h"
 #endif  // SRTP_RELATIVE_PATH
 }
+#endif // HAVE_SRTP
 
 #include "webrtc/base/logging.h"
 
+#if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
+
 // Begin test case 0 */
 static const uint8_t kExternalHmacTestCase0Key[20] = {
   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
   0x0b, 0x0b, 0x0b, 0x0b
 };
 
 static const uint8_t kExternalHmacTestCase0Data[8] = {
   0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65   // "Hi There"
 };
@@ skipping 112 matching lines @@
       const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1);
   if (status) {
     LOG(LS_ERROR) << "Error in replacing default auth module, error: "
                   << status;
     return err_status_fail;
   }
   return err_status_ok;
 }
 
 #endif  // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)