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

Side by Side Diff: webrtc/base/opensslstreamadapter.cc

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: google::int32 Created 5 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 372
373 *cipher = cipher_name; 373 *cipher = cipher_name;
374 #ifdef OPENSSL_IS_BORINGSSL 374 #ifdef OPENSSL_IS_BORINGSSL
375 OPENSSL_free(cipher_name); 375 OPENSSL_free(cipher_name);
376 #endif 376 #endif
377 return true; 377 return true;
378 } 378 }
379 379
380 // Key Extractor interface 380 // Key Extractor interface
381 bool OpenSSLStreamAdapter::ExportKeyingMaterial(const std::string& label, 381 bool OpenSSLStreamAdapter::ExportKeyingMaterial(const std::string& label,
382 const uint8* context, 382 const uint8_t* context,
383 size_t context_len, 383 size_t context_len,
384 bool use_context, 384 bool use_context,
385 uint8* result, 385 uint8_t* result,
386 size_t result_len) { 386 size_t result_len) {
387 #ifdef HAVE_DTLS_SRTP 387 #ifdef HAVE_DTLS_SRTP
388 int i; 388 int i;
389 389
390 i = SSL_export_keying_material(ssl_, result, result_len, 390 i = SSL_export_keying_material(ssl_, result, result_len, label.c_str(),
391 label.c_str(), label.length(), 391 label.length(), const_cast<uint8_t*>(context),
392 const_cast<uint8 *>(context),
393 context_len, use_context); 392 context_len, use_context);
394 393
395 if (i != 1) 394 if (i != 1)
396 return false; 395 return false;
397 396
398 return true; 397 return true;
399 #else 398 #else
400 return false; 399 return false;
401 #endif 400 #endif
402 } 401 }
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 #endif 1162 #endif
1164 } 1163 }
1165 } else { 1164 } else {
1166 return std::string(); 1165 return std::string();
1167 } 1166 }
1168 } 1167 }
1169 1168
1170 } // namespace rtc 1169 } // namespace rtc
1171 1170
1172 #endif // HAVE_OPENSSL_SSL_H 1171 #endif // HAVE_OPENSSL_SSL_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698