openssl/LICENSE - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

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: openssl/LICENSE

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/

Patch Set: '' Created 8 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 | Annotate | Revision Log

« no previous file with comments | « openssl/INSTALL.WCE ('k') | openssl/Makefile » ('j') | no next file with comments »

OLD	NEW
1	1

2 LICENSE ISSUES	2 LICENSE ISSUES

3 ==============	3 ==============

4	4

5 The OpenSSL toolkit stays under a dual license, i.e. both the conditions of	5 The OpenSSL toolkit stays under a dual license, i.e. both the conditions of

6 the OpenSSL License and the original SSLeay license apply to the toolkit.	6 the OpenSSL License and the original SSLeay license apply to the toolkit.

7 See below for the actual license texts. Actually both licenses are BSD-style	7 See below for the actual license texts. Actually both licenses are BSD-style

8 Open Source licenses. In case of any license issues related to OpenSSL	8 Open Source licenses. In case of any license issues related to OpenSSL

9 please contact openssl-core@openssl.org.	9 please contact openssl-core@openssl.org.

10	10

11 OpenSSL License	11 OpenSSL License

12 ---------------	12 ---------------

13	13

14 /* ====================================================================	14 /* ====================================================================

15 * Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.	15 * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.

16 *	16 *

17 * Redistribution and use in source and binary forms, with or without	17 * Redistribution and use in source and binary forms, with or without

18 * modification, are permitted provided that the following conditions	18 * modification, are permitted provided that the following conditions

19 * are met:	19 * are met:

20 *	20 *

21 * 1. Redistributions of source code must retain the above copyright	21 * 1. Redistributions of source code must retain the above copyright

22 * notice, this list of conditions and the following disclaimer.	22 * notice, this list of conditions and the following disclaimer.

23 *	23 *

24 * 2. Redistributions in binary form must reproduce the above copyright	24 * 2. Redistributions in binary form must reproduce the above copyright

25 * notice, this list of conditions and the following disclaimer in	25 * notice, this list of conditions and the following disclaimer in

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY	118 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

119 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	119 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

120 * SUCH DAMAGE.	120 * SUCH DAMAGE.

121 *	121 *

122 * The licence and distribution terms for any publically available version or	122 * The licence and distribution terms for any publically available version or

123 * derivative of this code cannot be changed. i.e. this code cannot simply be	123 * derivative of this code cannot be changed. i.e. this code cannot simply be

124 * copied and put under another distribution licence	124 * copied and put under another distribution licence

125 * [including the GNU Public Licence.]	125 * [including the GNU Public Licence.]

126 */	126 */

127	127

OLD	NEW