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

Side by Side Diff: webrtc/pc/externalhmac.cc

Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/externalhmac.h ('k') | webrtc/pc/pc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) 11 #if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
12 12
13 #include "webrtc/pc/externalhmac.h" 13 #include "webrtc/pc/externalhmac.h"
14 14
15 #include <stdlib.h> // For malloc/free. 15 #include <stdlib.h> // For malloc/free.
16 16
17 extern "C" { 17 extern "C" {
18 #ifdef SRTP_RELATIVE_PATH
19 #include "crypto_kernel.h" // NOLINT
20 #include "srtp.h" // NOLINT
21 #else
18 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h" 22 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h"
19 #include "third_party/libsrtp/srtp/include/srtp.h" 23 #include "third_party/libsrtp/srtp/include/srtp.h"
24 #endif // SRTP_RELATIVE_PATH
20 } 25 }
21 26
22 #include "webrtc/base/logging.h" 27 #include "webrtc/base/logging.h"
23 28
24 // Begin test case 0 */ 29 // Begin test case 0 */
25 static const uint8_t kExternalHmacTestCase0Key[20] = { 30 static const uint8_t kExternalHmacTestCase0Key[20] = {
26 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 31 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
27 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 32 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
28 0x0b, 0x0b, 0x0b, 0x0b 33 0x0b, 0x0b, 0x0b, 0x0b
29 }; 34 };
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1); 151 const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1);
147 if (status) { 152 if (status) {
148 LOG(LS_ERROR) << "Error in replacing default auth module, error: " 153 LOG(LS_ERROR) << "Error in replacing default auth module, error: "
149 << status; 154 << status;
150 return err_status_fail; 155 return err_status_fail;
151 } 156 }
152 return err_status_ok; 157 return err_status_ok;
153 } 158 }
154 159
155 #endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) 160 #endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
OLDNEW
« no previous file with comments | « webrtc/pc/externalhmac.h ('k') | webrtc/pc/pc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698