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

Side by Side Diff: webrtc/base/nssstreamadapter.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 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 sizeof(ciphersuite_info)); 945 sizeof(ciphersuite_info));
946 if (rv == SECFailure) 946 if (rv == SECFailure)
947 return false; 947 return false;
948 948
949 *cipher = ciphersuite_info.cipherSuiteName; 949 *cipher = ciphersuite_info.cipherSuiteName;
950 return true; 950 return true;
951 } 951 }
952 952
953 // RFC 5705 Key Exporter 953 // RFC 5705 Key Exporter
954 bool NSSStreamAdapter::ExportKeyingMaterial(const std::string& label, 954 bool NSSStreamAdapter::ExportKeyingMaterial(const std::string& label,
955 const uint8* context, 955 const uint8_t* context,
956 size_t context_len, 956 size_t context_len,
957 bool use_context, 957 bool use_context,
958 uint8* result, 958 uint8_t* result,
959 size_t result_len) { 959 size_t result_len) {
960 SECStatus rv = SSL_ExportKeyingMaterial( 960 SECStatus rv = SSL_ExportKeyingMaterial(
961 ssl_fd_, 961 ssl_fd_,
962 label.c_str(), 962 label.c_str(),
963 checked_cast<unsigned int>(label.size()), 963 checked_cast<unsigned int>(label.size()),
964 use_context, 964 use_context,
965 context, 965 context,
966 checked_cast<unsigned int>(context_len), 966 checked_cast<unsigned int>(context_len),
967 result, 967 result,
968 checked_cast<unsigned int>(result_len)); 968 checked_cast<unsigned int>(result_len));
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 return kDefaultSslEcCipher12; 1118 return kDefaultSslEcCipher12;
1119 } 1119 }
1120 } else { 1120 } else {
1121 return std::string(); 1121 return std::string();
1122 } 1122 }
1123 } 1123 }
1124 1124
1125 } // namespace rtc 1125 } // namespace rtc
1126 1126
1127 #endif // HAVE_NSS_SSL_H 1127 #endif // HAVE_NSS_SSL_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698