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

Side by Side Diff: webrtc/base/openssldigest.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/openssladapter.cc ('k') | webrtc/base/opensslidentity.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 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
11 #include "webrtc/base/openssldigest.h" 11 #include "webrtc/base/openssldigest.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/openssl.h" 14 #include "webrtc/base/openssl.h"
15 15
16 namespace rtc { 16 namespace rtc {
17 17
18 OpenSSLDigest::OpenSSLDigest(const std::string& algorithm) { 18 OpenSSLDigest::OpenSSLDigest(const std::string& algorithm) {
19 EVP_MD_CTX_init(&ctx_); 19 EVP_MD_CTX_init(&ctx_);
20 if (GetDigestEVP(algorithm, &md_)) { 20 if (GetDigestEVP(algorithm, &md_)) {
21 EVP_DigestInit_ex(&ctx_, md_, NULL); 21 EVP_DigestInit_ex(&ctx_, md_, nullptr);
22 } else { 22 } else {
23 md_ = NULL; 23 md_ = nullptr;
24 } 24 }
25 } 25 }
26 26
27 OpenSSLDigest::~OpenSSLDigest() { 27 OpenSSLDigest::~OpenSSLDigest() {
28 EVP_MD_CTX_cleanup(&ctx_); 28 EVP_MD_CTX_cleanup(&ctx_);
29 } 29 }
30 30
31 size_t OpenSSLDigest::Size() const { 31 size_t OpenSSLDigest::Size() const {
32 if (!md_) { 32 if (!md_) {
33 return 0; 33 return 0;
34 } 34 }
35 return EVP_MD_size(md_); 35 return EVP_MD_size(md_);
36 } 36 }
37 37
38 void OpenSSLDigest::Update(const void* buf, size_t len) { 38 void OpenSSLDigest::Update(const void* buf, size_t len) {
39 if (!md_) { 39 if (!md_) {
40 return; 40 return;
41 } 41 }
42 EVP_DigestUpdate(&ctx_, buf, len); 42 EVP_DigestUpdate(&ctx_, buf, len);
43 } 43 }
44 44
45 size_t OpenSSLDigest::Finish(void* buf, size_t len) { 45 size_t OpenSSLDigest::Finish(void* buf, size_t len) {
46 if (!md_ || len < Size()) { 46 if (!md_ || len < Size()) {
47 return 0; 47 return 0;
48 } 48 }
49 unsigned int md_len; 49 unsigned int md_len;
50 EVP_DigestFinal_ex(&ctx_, static_cast<unsigned char*>(buf), &md_len); 50 EVP_DigestFinal_ex(&ctx_, static_cast<unsigned char*>(buf), &md_len);
51 EVP_DigestInit_ex(&ctx_, md_, NULL); // prepare for future Update()s 51 EVP_DigestInit_ex(&ctx_, md_, nullptr); // prepare for future Update()s
52 RTC_DCHECK(md_len == Size()); 52 RTC_DCHECK(md_len == Size());
53 return md_len; 53 return md_len;
54 } 54 }
55 55
56 bool OpenSSLDigest::GetDigestEVP(const std::string& algorithm, 56 bool OpenSSLDigest::GetDigestEVP(const std::string& algorithm,
57 const EVP_MD** mdp) { 57 const EVP_MD** mdp) {
58 const EVP_MD* md; 58 const EVP_MD* md;
59 if (algorithm == DIGEST_MD5) { 59 if (algorithm == DIGEST_MD5) {
60 md = EVP_md5(); 60 md = EVP_md5();
61 } else if (algorithm == DIGEST_SHA_1) { 61 } else if (algorithm == DIGEST_SHA_1) {
(...skipping 11 matching lines...) Expand all
73 } 73 }
74 74
75 // Can't happen 75 // Can't happen
76 RTC_DCHECK(EVP_MD_size(md) >= 16); 76 RTC_DCHECK(EVP_MD_size(md) >= 16);
77 *mdp = md; 77 *mdp = md;
78 return true; 78 return true;
79 } 79 }
80 80
81 bool OpenSSLDigest::GetDigestName(const EVP_MD* md, 81 bool OpenSSLDigest::GetDigestName(const EVP_MD* md,
82 std::string* algorithm) { 82 std::string* algorithm) {
83 RTC_DCHECK(md != NULL); 83 RTC_DCHECK(md != nullptr);
84 RTC_DCHECK(algorithm != NULL); 84 RTC_DCHECK(algorithm != nullptr);
85 85
86 int md_type = EVP_MD_type(md); 86 int md_type = EVP_MD_type(md);
87 if (md_type == NID_md5) { 87 if (md_type == NID_md5) {
88 *algorithm = DIGEST_MD5; 88 *algorithm = DIGEST_MD5;
89 } else if (md_type == NID_sha1) { 89 } else if (md_type == NID_sha1) {
90 *algorithm = DIGEST_SHA_1; 90 *algorithm = DIGEST_SHA_1;
91 } else if (md_type == NID_sha224) { 91 } else if (md_type == NID_sha224) {
92 *algorithm = DIGEST_SHA_224; 92 *algorithm = DIGEST_SHA_224;
93 } else if (md_type == NID_sha256) { 93 } else if (md_type == NID_sha256) {
94 *algorithm = DIGEST_SHA_256; 94 *algorithm = DIGEST_SHA_256;
(...skipping 13 matching lines...) Expand all
108 size_t* length) { 108 size_t* length) {
109 const EVP_MD *md; 109 const EVP_MD *md;
110 if (!GetDigestEVP(algorithm, &md)) 110 if (!GetDigestEVP(algorithm, &md))
111 return false; 111 return false;
112 112
113 *length = EVP_MD_size(md); 113 *length = EVP_MD_size(md);
114 return true; 114 return true;
115 } 115 }
116 116
117 } // namespace rtc 117 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/openssladapter.cc ('k') | webrtc/base/opensslidentity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698