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

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

Issue 1383253002: Get rid of SCHANNEL code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 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/schanneladapter.cc ('k') | webrtc/base/sslidentity.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 #if HAVE_CONFIG_H 11 #if HAVE_CONFIG_H
12 #include "config.h" 12 #include "config.h"
13 #endif // HAVE_CONFIG_H 13 #endif // HAVE_CONFIG_H
14 14
15 #include "webrtc/base/ssladapter.h" 15 #include "webrtc/base/ssladapter.h"
16 16
17 #include "webrtc/base/sslconfig.h" 17 #include "webrtc/base/sslconfig.h"
18 18
19 #if SSL_USE_SCHANNEL 19 #if SSL_USE_OPENSSL
20
21 #include "schanneladapter.h"
22
23 #elif SSL_USE_OPENSSL // && !SSL_USE_SCHANNEL
24 20
25 #include "openssladapter.h" 21 #include "openssladapter.h"
26 22
27 #endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL 23 #endif
28 24
29 /////////////////////////////////////////////////////////////////////////////// 25 ///////////////////////////////////////////////////////////////////////////////
30 26
31 namespace rtc { 27 namespace rtc {
32 28
33 SSLAdapter* 29 SSLAdapter*
34 SSLAdapter::Create(AsyncSocket* socket) { 30 SSLAdapter::Create(AsyncSocket* socket) {
35 #if SSL_USE_SCHANNEL 31 #if SSL_USE_OPENSSL
36 return new SChannelAdapter(socket);
37 #elif SSL_USE_OPENSSL // && !SSL_USE_SCHANNEL
38 return new OpenSSLAdapter(socket); 32 return new OpenSSLAdapter(socket);
39 #else // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL 33 #else // !SSL_USE_OPENSSL
40 delete socket; 34 delete socket;
41 return NULL; 35 return NULL;
42 #endif // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL 36 #endif // SSL_USE_OPENSSL
43 } 37 }
44 38
45 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
46 40
47 #if SSL_USE_OPENSSL 41 #if SSL_USE_OPENSSL
48 42
49 bool InitializeSSL(VerificationCallback callback) { 43 bool InitializeSSL(VerificationCallback callback) {
50 return OpenSSLAdapter::InitializeSSL(callback); 44 return OpenSSLAdapter::InitializeSSL(callback);
51 } 45 }
52 46
(...skipping 12 matching lines...) Expand all
65 } 59 }
66 60
67 bool InitializeSSLThread() { 61 bool InitializeSSLThread() {
68 return true; 62 return true;
69 } 63 }
70 64
71 bool CleanupSSL() { 65 bool CleanupSSL() {
72 return true; 66 return true;
73 } 67 }
74 68
75 #endif // !SSL_USE_OPENSSL 69 #endif // SSL_USE_OPENSSL
76 70
77 /////////////////////////////////////////////////////////////////////////////// 71 ///////////////////////////////////////////////////////////////////////////////
78 72
79 } // namespace rtc 73 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/schanneladapter.cc ('k') | webrtc/base/sslidentity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698