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

Side by Side Diff: webrtc/rtc_base/openssladapter.cc

Issue 2962303003: Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)" (Closed)
Patch Set: Created 3 years, 5 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/rtc_base/openssladapter.h ('k') | webrtc/rtc_base/openssldigest.h » ('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 2008 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2008 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/rtc_base/openssladapter.h" 11 #include "webrtc/base/openssladapter.h"
12 12
13 #if defined(WEBRTC_POSIX) 13 #if defined(WEBRTC_POSIX)
14 #include <unistd.h> 14 #include <unistd.h>
15 #endif 15 #endif
16 16
17 // Must be included first before openssl headers. 17 // Must be included first before openssl headers.
18 #include "webrtc/rtc_base/win32.h" // NOLINT 18 #include "webrtc/base/win32.h" // NOLINT
19 19
20 #include <openssl/bio.h> 20 #include <openssl/bio.h>
21 #include <openssl/crypto.h> 21 #include <openssl/crypto.h>
22 #include <openssl/err.h> 22 #include <openssl/err.h>
23 #include <openssl/opensslv.h> 23 #include <openssl/opensslv.h>
24 #include <openssl/rand.h> 24 #include <openssl/rand.h>
25 #include <openssl/x509.h> 25 #include <openssl/x509.h>
26 #include <openssl/x509v3.h> 26 #include <openssl/x509v3.h>
27 27
28 #include "webrtc/rtc_base/arraysize.h" 28 #include "webrtc/base/arraysize.h"
29 #include "webrtc/rtc_base/checks.h" 29 #include "webrtc/base/checks.h"
30 #include "webrtc/rtc_base/logging.h" 30 #include "webrtc/base/logging.h"
31 #include "webrtc/rtc_base/openssl.h" 31 #include "webrtc/base/openssl.h"
32 #include "webrtc/rtc_base/safe_conversions.h" 32 #include "webrtc/base/safe_conversions.h"
33 #include "webrtc/rtc_base/sslroots.h" 33 #include "webrtc/base/sslroots.h"
34 #include "webrtc/rtc_base/stringutils.h" 34 #include "webrtc/base/stringutils.h"
35 #include "webrtc/rtc_base/thread.h" 35 #include "webrtc/base/thread.h"
36 36
37 #ifndef OPENSSL_IS_BORINGSSL 37 #ifndef OPENSSL_IS_BORINGSSL
38 38
39 // TODO: Use a nicer abstraction for mutex. 39 // TODO: Use a nicer abstraction for mutex.
40 40
41 #if defined(WEBRTC_WIN) 41 #if defined(WEBRTC_WIN)
42 #define MUTEX_TYPE HANDLE 42 #define MUTEX_TYPE HANDLE
43 #define MUTEX_SETUP(x) (x) = CreateMutex(nullptr, FALSE, nullptr) 43 #define MUTEX_SETUP(x) (x) = CreateMutex(nullptr, FALSE, nullptr)
44 #define MUTEX_CLEANUP(x) CloseHandle(x) 44 #define MUTEX_CLEANUP(x) CloseHandle(x)
45 #define MUTEX_LOCK(x) WaitForSingleObject((x), INFINITE) 45 #define MUTEX_LOCK(x) WaitForSingleObject((x), INFINITE)
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 ctx, "ALL:!SHA256:!SHA384:!aPSK:!ECDSA+SHA1:!ADH:!LOW:!EXP:!MD5"); 1019 ctx, "ALL:!SHA256:!SHA384:!aPSK:!ECDSA+SHA1:!ADH:!LOW:!EXP:!MD5");
1020 1020
1021 if (ssl_mode_ == SSL_MODE_DTLS) { 1021 if (ssl_mode_ == SSL_MODE_DTLS) {
1022 SSL_CTX_set_read_ahead(ctx, 1); 1022 SSL_CTX_set_read_ahead(ctx, 1);
1023 } 1023 }
1024 1024
1025 return ctx; 1025 return ctx;
1026 } 1026 }
1027 1027
1028 } // namespace rtc 1028 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/rtc_base/openssladapter.h ('k') | webrtc/rtc_base/openssldigest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698