webrtc/base/sslconfig.h - Issue 1311843006: Revert of purge nss files and dependencies

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1311843006: Revert of purge nss files and dependencies (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 5 years, 3 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

OLD	NEW
1 /*	1 /*

2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.	2 * Copyright 2012 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_SSLCONFIG_H_	11 #ifndef WEBRTC_BASE_SSLCONFIG_H_

12 #define WEBRTC_BASE_SSLCONFIG_H_	12 #define WEBRTC_BASE_SSLCONFIG_H_

13	13

14 // If no preference has been indicated, default to SChannel on Windows and	14 // If no preference has been indicated, default to SChannel on Windows and

15 // OpenSSL everywhere else, if it is available.	15 // OpenSSL everywhere else, if it is available.

16 #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)	16 #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) && \

	17 !defined(SSL_USE_NSS)

17 #if defined(WEBRTC_WIN)	18 #if defined(WEBRTC_WIN)

18	19

19 #define SSL_USE_SCHANNEL 1	20 #define SSL_USE_SCHANNEL 1

20	21

21 #else // defined(WEBRTC_WIN)	22 #else // defined(WEBRTC_WIN)

22	23

23 #if defined(HAVE_OPENSSL_SSL_H)	24 #if defined(HAVE_OPENSSL_SSL_H)

24 #define SSL_USE_OPENSSL 1	25 #define SSL_USE_OPENSSL 1

	26 #elif defined(HAVE_NSS_SSL_H)

	27 #define SSL_USE_NSS 1

25 #endif	28 #endif

26	29

27 #endif // !defined(WEBRTC_WIN)	30 #endif // !defined(WEBRTC_WIN)

28 #endif	31 #endif

29	32

30 #endif // WEBRTC_BASE_SSLCONFIG_H_	33 #endif // WEBRTC_BASE_SSLCONFIG_H_

OLD	NEW

« no previous file with comments | « webrtc/base/ssladapter.cc ('k') | webrtc/base/sslidentity.cc » ('j') | no next file with comments »