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

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

Issue 2424093002: Return nullptr from RTCCertificate::FromPEM on failure. (Closed)
Patch Set: Created 4 years, 2 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/rtccertificate.h ('k') | webrtc/base/rtccertificate_unittest.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 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 RTCCertificatePEM RTCCertificate::ToPEM() const { 48 RTCCertificatePEM RTCCertificate::ToPEM() const {
49 return RTCCertificatePEM(identity_->PrivateKeyToPEMString(), 49 return RTCCertificatePEM(identity_->PrivateKeyToPEMString(),
50 ssl_certificate().ToPEMString()); 50 ssl_certificate().ToPEMString());
51 } 51 }
52 52
53 scoped_refptr<RTCCertificate> RTCCertificate::FromPEM( 53 scoped_refptr<RTCCertificate> RTCCertificate::FromPEM(
54 const RTCCertificatePEM& pem) { 54 const RTCCertificatePEM& pem) {
55 std::unique_ptr<SSLIdentity> identity(SSLIdentity::FromPEMStrings( 55 std::unique_ptr<SSLIdentity> identity(SSLIdentity::FromPEMStrings(
56 pem.private_key(), pem.certificate())); 56 pem.private_key(), pem.certificate()));
57 if (!identity)
58 return nullptr;
57 return new RefCountedObject<RTCCertificate>(identity.release()); 59 return new RefCountedObject<RTCCertificate>(identity.release());
58 } 60 }
59 61
60 bool RTCCertificate::operator==(const RTCCertificate& certificate) const { 62 bool RTCCertificate::operator==(const RTCCertificate& certificate) const {
61 return *this->identity_ == *certificate.identity_; 63 return *this->identity_ == *certificate.identity_;
62 } 64 }
63 65
64 bool RTCCertificate::operator!=(const RTCCertificate& certificate) const { 66 bool RTCCertificate::operator!=(const RTCCertificate& certificate) const {
65 return !(*this == certificate); 67 return !(*this == certificate);
66 } 68 }
67 69
68 } // namespace rtc 70 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/rtccertificate.h ('k') | webrtc/base/rtccertificate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698