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

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

Issue 2648003003: Revert of Removing #defines previously used for building without BoringSSL/OpenSSL. (Closed)
Patch Set: 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/opensslstreamadapter.cc ('k') | webrtc/base/ssladapter_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 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/ssladapter.h" 11 #include "webrtc/base/ssladapter.h"
12 12
13 #include "webrtc/base/openssladapter.h" 13 #include "webrtc/base/sslconfig.h"
14
15 #if SSL_USE_OPENSSL
16
17 #include "openssladapter.h"
18
19 #endif
14 20
15 /////////////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////////////
16 22
17 namespace rtc { 23 namespace rtc {
18 24
19 SSLAdapter* 25 SSLAdapter*
20 SSLAdapter::Create(AsyncSocket* socket) { 26 SSLAdapter::Create(AsyncSocket* socket) {
27 #if SSL_USE_OPENSSL
21 return new OpenSSLAdapter(socket); 28 return new OpenSSLAdapter(socket);
29 #else // !SSL_USE_OPENSSL
30 delete socket;
31 return NULL;
32 #endif // SSL_USE_OPENSSL
22 } 33 }
23 34
24 /////////////////////////////////////////////////////////////////////////////// 35 ///////////////////////////////////////////////////////////////////////////////
25 36
37 #if SSL_USE_OPENSSL
38
26 bool InitializeSSL(VerificationCallback callback) { 39 bool InitializeSSL(VerificationCallback callback) {
27 return OpenSSLAdapter::InitializeSSL(callback); 40 return OpenSSLAdapter::InitializeSSL(callback);
28 } 41 }
29 42
30 bool InitializeSSLThread() { 43 bool InitializeSSLThread() {
31 return OpenSSLAdapter::InitializeSSLThread(); 44 return OpenSSLAdapter::InitializeSSLThread();
32 } 45 }
33 46
34 bool CleanupSSL() { 47 bool CleanupSSL() {
35 return OpenSSLAdapter::CleanupSSL(); 48 return OpenSSLAdapter::CleanupSSL();
36 } 49 }
37 50
51 #else // !SSL_USE_OPENSSL
52
53 bool InitializeSSL(VerificationCallback callback) {
54 return true;
55 }
56
57 bool InitializeSSLThread() {
58 return true;
59 }
60
61 bool CleanupSSL() {
62 return true;
63 }
64
65 #endif // SSL_USE_OPENSSL
66
38 /////////////////////////////////////////////////////////////////////////////// 67 ///////////////////////////////////////////////////////////////////////////////
39 68
40 } // namespace rtc 69 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/opensslstreamadapter.cc ('k') | webrtc/base/ssladapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698