Remove remnants of libsrtp1

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.
  */
 
 #include "webrtc/pc/externalhmac.h"
 
 #include <stdlib.h>  // For malloc/free.
 
+#include "webrtc/base/logging.h"
+
 #ifdef HAVE_SRTP
-extern "C" {
-#ifdef SRTP_RELATIVE_PATH
-#include "crypto_kernel.h"  // NOLINT
-#include "srtp.h"  // NOLINT
-#else
 #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"
-
-#ifdef COMPILING_AGAINST_LIBSRTP1
-#define srtp_auth_type_t auth_type_t
-
-#define srtp_auth_init_func auth_init_func
-#define srtp_auth_compute_func auth_compute_func
-#define srtp_auth_update_func auth_update_func
-#define srtp_auth_start_func auth_start_func
-#define srtp_auth_test_case_t auth_test_case_t
-
-#define srtp_replace_auth_type crypto_kernel_replace_auth_type
-#endif  // COMPILING_AGAINST_LIBSRTP1
-
 #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] = {
@@ skipping 13 matching lines @@
   const_cast<uint8_t*>(kExternalHmacFakeTag),          // Tag
   NULL                                                   // Pointer to next
                                                          // testcase
 };
 
 static const char kExternalHmacDescription[] =
     "external hmac sha-1 authentication";
 
 // srtp_auth_type_t external_hmac is the hmac metaobject
 
-#ifdef COMPILING_AGAINST_LIBSRTP1
 static const srtp_auth_type_t external_hmac  = {
   external_hmac_alloc,
   external_hmac_dealloc,
-  (srtp_auth_init_func)    external_hmac_init,
-  (srtp_auth_compute_func) external_hmac_compute,
-  (srtp_auth_update_func)  external_hmac_update,
-  (srtp_auth_start_func)   external_hmac_start,
-  const_cast<char*>(kExternalHmacDescription),
-  0,     // Instance count.
-  const_cast<srtp_auth_test_case_t*>(&kExternalHmacTestCase0),
-  NULL,  // No debugging module.
-  EXTERNAL_HMAC_SHA1
-};
-#else
-static const srtp_auth_type_t external_hmac  = {
-  external_hmac_alloc,
-  external_hmac_dealloc,
   (srtp_auth_init_func)    external_hmac_init,
   (srtp_auth_compute_func) external_hmac_compute,
   (srtp_auth_update_func)  external_hmac_update,
   (srtp_auth_start_func)   external_hmac_start,
   const_cast<char*>(kExternalHmacDescription),
   const_cast<srtp_auth_test_case_t*>(&kExternalHmacTestCase0),
   EXTERNAL_HMAC_SHA1
 };
-#endif  // COMPILING_AGAINST_LIBSRTP1
 
 srtp_err_status_t external_hmac_alloc(srtp_auth_t** a,
                                       int key_len,
                                       int out_len) {
   uint8_t* pointer;
 
   // Check key length - note that we don't support keys larger
   // than 20 bytes yet
   if (key_len > 20)
     return srtp_err_status_bad_param;
@@ skipping 69 matching lines @@
       const_cast<srtp_auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1);
   if (status) {
     LOG(LS_ERROR) << "Error in replacing default auth module, error: "
                   << status;
     return srtp_err_status_fail;
   }
   return srtp_err_status_ok;
 }
 
 #endif  // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)