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

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

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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/base/macutils.cc ('k') | webrtc/base/messagequeue.h » ('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 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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 16 matching lines...) Expand all
27 const char DIGEST_SHA_256[] = "sha-256"; 27 const char DIGEST_SHA_256[] = "sha-256";
28 const char DIGEST_SHA_384[] = "sha-384"; 28 const char DIGEST_SHA_384[] = "sha-384";
29 const char DIGEST_SHA_512[] = "sha-512"; 29 const char DIGEST_SHA_512[] = "sha-512";
30 30
31 static const size_t kBlockSize = 64; // valid for SHA-256 and down 31 static const size_t kBlockSize = 64; // valid for SHA-256 and down
32 32
33 MessageDigest* MessageDigestFactory::Create(const std::string& alg) { 33 MessageDigest* MessageDigestFactory::Create(const std::string& alg) {
34 MessageDigest* digest = new OpenSSLDigest(alg); 34 MessageDigest* digest = new OpenSSLDigest(alg);
35 if (digest->Size() == 0) { // invalid algorithm 35 if (digest->Size() == 0) { // invalid algorithm
36 delete digest; 36 delete digest;
37 digest = NULL; 37 digest = nullptr;
38 } 38 }
39 return digest; 39 return digest;
40 } 40 }
41 41
42 bool IsFips180DigestAlgorithm(const std::string& alg) { 42 bool IsFips180DigestAlgorithm(const std::string& alg) {
43 // These are the FIPS 180 algorithms. According to RFC 4572 Section 5, 43 // These are the FIPS 180 algorithms. According to RFC 4572 Section 5,
44 // "Self-signed certificates (for which legacy certificates are not a 44 // "Self-signed certificates (for which legacy certificates are not a
45 // consideration) MUST use one of the FIPS 180 algorithms (SHA-1, 45 // consideration) MUST use one of the FIPS 180 algorithms (SHA-1,
46 // SHA-224, SHA-256, SHA-384, or SHA-512) as their signature algorithm, 46 // SHA-224, SHA-256, SHA-384, or SHA-512) as their signature algorithm,
47 // and thus also MUST use it to calculate certificate fingerprints." 47 // and thus also MUST use it to calculate certificate fingerprints."
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 158 }
159 159
160 std::string ComputeHmac(const std::string& alg, const std::string& key, 160 std::string ComputeHmac(const std::string& alg, const std::string& key,
161 const std::string& input) { 161 const std::string& input) {
162 std::string output; 162 std::string output;
163 ComputeHmac(alg, key, input, &output); 163 ComputeHmac(alg, key, input, &output);
164 return output; 164 return output;
165 } 165 }
166 166
167 } // namespace rtc 167 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/macutils.cc ('k') | webrtc/base/messagequeue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698