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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/dtmfsender_unittest.cc ('k') | webrtc/pc/iceserverparsing.cc » ('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 #include "webrtc/pc/externalhmac.h" 11 #include "webrtc/pc/externalhmac.h"
12 12
13 #include <stdlib.h> // For malloc/free. 13 #include <stdlib.h> // For malloc/free.
14 14
15 #include "webrtc/base/logging.h" 15 #include "webrtc/rtc_base/logging.h"
16 16
17 #include "third_party/libsrtp/crypto/include/crypto_kernel.h" 17 #include "third_party/libsrtp/crypto/include/crypto_kernel.h"
18 #include "third_party/libsrtp/include/srtp.h" 18 #include "third_party/libsrtp/include/srtp.h"
19 19
20 // Begin test case 0 */ 20 // Begin test case 0 */
21 static const uint8_t kExternalHmacTestCase0Key[20] = { 21 static const uint8_t kExternalHmacTestCase0Key[20] = {
22 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 22 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
23 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 23 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
24 0x0b, 0x0b, 0x0b, 0x0b 24 0x0b, 0x0b, 0x0b, 0x0b
25 }; 25 };
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // non-const. 139 // non-const.
140 srtp_err_status_t status = srtp_replace_auth_type( 140 srtp_err_status_t status = srtp_replace_auth_type(
141 const_cast<srtp_auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1); 141 const_cast<srtp_auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1);
142 if (status) { 142 if (status) {
143 LOG(LS_ERROR) << "Error in replacing default auth module, error: " 143 LOG(LS_ERROR) << "Error in replacing default auth module, error: "
144 << status; 144 << status;
145 return srtp_err_status_fail; 145 return srtp_err_status_fail;
146 } 146 }
147 return srtp_err_status_ok; 147 return srtp_err_status_ok;
148 } 148 }
OLDNEW
« no previous file with comments | « webrtc/pc/dtmfsender_unittest.cc ('k') | webrtc/pc/iceserverparsing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698