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

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

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 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/onetimeevent.h ('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 <string> 18 #include <string>
18 19
19 #include "webrtc/base/common.h" 20 #include "webrtc/base/common.h"
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/base/sslidentity.h" 21 #include "webrtc/base/sslidentity.h"
22 22
23 typedef struct ssl_ctx_st SSL_CTX; 23 typedef struct ssl_ctx_st SSL_CTX;
24 24
25 namespace rtc { 25 namespace rtc {
26 26
27 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object, 27 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object,
28 // which is reference counted inside the OpenSSL library. 28 // which is reference counted inside the OpenSSL library.
29 class OpenSSLKeyPair { 29 class OpenSSLKeyPair {
30 public: 30 public:
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 size_t* length) const override; 78 size_t* length) const override;
79 79
80 // Compute the digest of a certificate as an X509 * 80 // Compute the digest of a certificate as an X509 *
81 static bool ComputeDigest(const X509* x509, 81 static bool ComputeDigest(const X509* x509,
82 const std::string& algorithm, 82 const std::string& algorithm,
83 unsigned char* digest, 83 unsigned char* digest,
84 size_t size, 84 size_t size,
85 size_t* length); 85 size_t* length);
86 86
87 bool GetSignatureDigestAlgorithm(std::string* algorithm) const override; 87 bool GetSignatureDigestAlgorithm(std::string* algorithm) const override;
88 rtc::scoped_ptr<SSLCertChain> GetChain() const override; 88 std::unique_ptr<SSLCertChain> GetChain() const override;
89 89
90 int64_t CertificateExpirationTime() const override; 90 int64_t CertificateExpirationTime() const override;
91 91
92 private: 92 private:
93 void AddReference() const; 93 void AddReference() const;
94 94
95 X509* x509_; 95 X509* x509_;
96 96
97 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLCertificate); 97 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLCertificate);
98 }; 98 };
(...skipping 14 matching lines...) Expand all
113 OpenSSLIdentity* GetReference() const override; 113 OpenSSLIdentity* GetReference() const override;
114 114
115 // Configure an SSL context object to use our key and certificate. 115 // Configure an SSL context object to use our key and certificate.
116 bool ConfigureIdentity(SSL_CTX* ctx); 116 bool ConfigureIdentity(SSL_CTX* ctx);
117 117
118 private: 118 private:
119 OpenSSLIdentity(OpenSSLKeyPair* key_pair, OpenSSLCertificate* certificate); 119 OpenSSLIdentity(OpenSSLKeyPair* key_pair, OpenSSLCertificate* certificate);
120 120
121 static OpenSSLIdentity* GenerateInternal(const SSLIdentityParams& params); 121 static OpenSSLIdentity* GenerateInternal(const SSLIdentityParams& params);
122 122
123 scoped_ptr<OpenSSLKeyPair> key_pair_; 123 std::unique_ptr<OpenSSLKeyPair> key_pair_;
124 scoped_ptr<OpenSSLCertificate> certificate_; 124 std::unique_ptr<OpenSSLCertificate> certificate_;
125 125
126 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity); 126 RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity);
127 }; 127 };
128 128
129 129
130 } // namespace rtc 130 } // namespace rtc
131 131
132 #endif // WEBRTC_BASE_OPENSSLIDENTITY_H_ 132 #endif // WEBRTC_BASE_OPENSSLIDENTITY_H_
OLDNEW
« no previous file with comments | « webrtc/base/onetimeevent.h ('k') | webrtc/base/opensslidentity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698