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

Side by Side Diff: webrtc/base/opensslidentity.h

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. Created 3 years, 11 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/openssldigest.cc ('k') | webrtc/base/opensslidentity.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 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 #ifndef WEBRTC_BASE_OPENSSLIDENTITY_H_ 11 #ifndef WEBRTC_BASE_OPENSSLIDENTITY_H_
12 #define WEBRTC_BASE_OPENSSLIDENTITY_H_ 12 #define WEBRTC_BASE_OPENSSLIDENTITY_H_
13 13
14 #include <openssl/evp.h> 14 #include <openssl/evp.h>
15 #include <openssl/x509.h> 15 #include <openssl/x509.h>
16 16
17 #include <memory> 17 #include <memory>
18 #include <string> 18 #include <string>
19 19
20 #include "webrtc/base/checks.h"
20 #include "webrtc/base/common.h" 21 #include "webrtc/base/common.h"
21 #include "webrtc/base/constructormagic.h" 22 #include "webrtc/base/constructormagic.h"
22 #include "webrtc/base/sslidentity.h" 23 #include "webrtc/base/sslidentity.h"
23 24
24 typedef struct ssl_ctx_st SSL_CTX; 25 typedef struct ssl_ctx_st SSL_CTX;
25 26
26 namespace rtc { 27 namespace rtc {
27 28
28 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object, 29 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object,
29 // which is reference counted inside the OpenSSL library. 30 // which is reference counted inside the OpenSSL library.
30 class OpenSSLKeyPair { 31 class OpenSSLKeyPair {
31 public: 32 public:
32 explicit OpenSSLKeyPair(EVP_PKEY* pkey) : pkey_(pkey) { 33 explicit OpenSSLKeyPair(EVP_PKEY* pkey) : pkey_(pkey) {
33 ASSERT(pkey_ != NULL); 34 RTC_DCHECK(pkey_ != NULL);
34 } 35 }
35 36
36 static OpenSSLKeyPair* Generate(const KeyParams& key_params); 37 static OpenSSLKeyPair* Generate(const KeyParams& key_params);
37 // Constructs a key pair from the private key PEM string. This must not result 38 // Constructs a key pair from the private key PEM string. This must not result
38 // in missing public key parameters. Returns null on error. 39 // in missing public key parameters. Returns null on error.
39 static OpenSSLKeyPair* FromPrivateKeyPEMString( 40 static OpenSSLKeyPair* FromPrivateKeyPEMString(
40 const std::string& pem_string); 41 const std::string& pem_string);
41 42
42 virtual ~OpenSSLKeyPair(); 43 virtual ~OpenSSLKeyPair();
43 44
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 std::unique_ptr<OpenSSLKeyPair> key_pair_; 139 std::unique_ptr<OpenSSLKeyPair> key_pair_;
139 std::unique_ptr<OpenSSLCertificate> certificate_; 140 std::unique_ptr<OpenSSLCertificate> certificate_;
140 141
141 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity); 142 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity);
142 }; 143 };
143 144
144 145
145 } // namespace rtc 146 } // namespace rtc
146 147
147 #endif // WEBRTC_BASE_OPENSSLIDENTITY_H_ 148 #endif // WEBRTC_BASE_OPENSSLIDENTITY_H_
OLDNEW
« no previous file with comments | « webrtc/base/openssldigest.cc ('k') | webrtc/base/opensslidentity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698