Cleaned up the LICENSE document: The official contact for any license (0b903ec0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,13 @@

	Changes between 0.9.1c and 0.9.2		Changes between 0.9.1c and 0.9.2

			*) Cleaned up the LICENSE document: The official contact for any license
			questions now is the OpenSSL core team under openssl-core@openssl.org.
			And add a paragraph about the dual-license situation to make sure people
			recognize that _BOTH_ the OpenSSL license _AND_ the SSLeay license apply
			to the OpenSSL toolkit.
			[Ralf S. Engelschall]

	*) General source tree makefile cleanups: Made `making xxx in yyy...'		*) General source tree makefile cleanups: Made `making xxx in yyy...'
	display consistent in the source tree and replaced `/bin/rm' by `rm'.		display consistent in the source tree and replaced `/bin/rm' by `rm'.
	Additonally cleaned up the `make links' target: Remove unnecessary		Additonally cleaned up the `make links' target: Remove unnecessary

LICENSE

+72 −69

Original line number	Original line	Diff line number	Diff line

			LICENSE ISSUES
			==============

			The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
			the OpenSSL License and the original SSLeay license apply to the toolkit.
			See below for the actual license texts. Actually both licenses are BSD-style
			Open Source licenses. In case of any license issues related to OpenSSL
			please contact openssl-core@openssl.org.

			OpenSSL License
			---------------

	/* ====================================================================		/* ====================================================================
	* Copyright (c) 1998 The OpenSSL Project. All rights reserved.		* Copyright (c) 1998-1999 The OpenSSL Project. All rights reserved.
	*		*
	* Redistribution and use in source and binary forms, with or without		* Redistribution and use in source and binary forms, with or without
	* modification, are permitted provided that the following conditions		* modification, are permitted provided that the following conditions
	@@ -22,7 +34,7 @@
	* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to		* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
	* endorse or promote products derived from this software without		* endorse or promote products derived from this software without
	* prior written permission. For written permission, please contact		* prior written permission. For written permission, please contact
	* openssl@openssl.org.		* openssl-core@openssl.org.
	*		*
	* 5. Products derived from this software may not be called "OpenSSL"		* 5. Products derived from this software may not be called "OpenSSL"
	* nor may "OpenSSL" appear in their names without prior written		* nor may "OpenSSL" appear in their names without prior written
	@@ -52,73 +64,64 @@
	* Hudson (tjh@cryptsoft.com).		* Hudson (tjh@cryptsoft.com).
	*		*
	*/		*/
	__________________________________________________________________________

	Original SSLeay License		Original SSLeay License
	__________________________________________________________________________		-----------------------

	Copyright (C) 1997 Eric Young (eay@cryptsoft.com)
	All rights reserved.

	This package is an SSL implementation written by Eric Young (eay@cryptsoft.com).
	The implementation was written so as to conform with Netscapes SSL.

	This library is free for commercial and non-commercial use as long as
	the following conditions are aheared to. The following conditions
	apply to all code found in this distribution, be it the RC4, RSA,
	lhash, DES, etc., code; not just the SSL code. The SSL documentation
	included with this distribution is covered by the same copyright terms
	except that the holder is Tim Hudson (tjh@cryptsoft.com).

	Please note that MD2, MD5 and IDEA are publically available standards		/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
	that contain sample implementations, I have re-coded them in my own		* All rights reserved.
	way but there is nothing special about those implementations. The DES		*
	library is another mater :-).		* This package is an SSL implementation written
			* by Eric Young (eay@cryptsoft.com).
	Copyright remains Eric Young's, and as such any Copyright notices in		* The implementation was written so as to conform with Netscapes SSL.
	the code are not to be removed.		*
	If this package is used in a product, Eric Young should be given attribution		* This library is free for commercial and non-commercial use as long as
	as the author of the parts of the library used.		* the following conditions are aheared to. The following conditions
	This can be in the form of a textual message at program startup or		* apply to all code found in this distribution, be it the RC4, RSA,
	in documentation (online or textual) provided with the package.		* lhash, DES, etc., code; not just the SSL code. The SSL documentation
			* included with this distribution is covered by the same copyright terms
	Redistribution and use in source and binary forms, with or without		* except that the holder is Tim Hudson (tjh@cryptsoft.com).
	modification, are permitted provided that the following conditions		*
	are met:		* Copyright remains Eric Young's, and as such any Copyright notices in
	1. Redistributions of source code must retain the copyright		* the code are not to be removed.
	notice, this list of conditions and the following disclaimer.		* If this package is used in a product, Eric Young should be given attribution
	2. Redistributions in binary form must reproduce the above copyright		* as the author of the parts of the library used.
	notice, this list of conditions and the following disclaimer in the		* This can be in the form of a textual message at program startup or
	documentation and/or other materials provided with the distribution.		* in documentation (online or textual) provided with the package.
	3. All advertising materials mentioning features or use of this software		*
	must display the following acknowledgement:		* Redistribution and use in source and binary forms, with or without
	"This product includes cryptographic software written by		* modification, are permitted provided that the following conditions
	Eric Young (eay@cryptsoft.com)"		* are met:
	The word 'cryptographic' can be left out if the rouines from the library		* 1. Redistributions of source code must retain the copyright
	being used are not cryptographic related :-).		* notice, this list of conditions and the following disclaimer.
	4. If you include any Windows specific code (or a derivative thereof) from		* 2. Redistributions in binary form must reproduce the above copyright
	the apps directory (application code) you must include an acknowledgement:		* notice, this list of conditions and the following disclaimer in the
	"This product includes software written by Tim Hudson (tjh@cryptsoft.com)"		* documentation and/or other materials provided with the distribution.
			* 3. All advertising materials mentioning features or use of this software
	THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND		* must display the following acknowledgement:
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE		* "This product includes cryptographic software written by
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE		* Eric Young (eay@cryptsoft.com)"
	ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE		* The word 'cryptographic' can be left out if the rouines from the library
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL		* being used are not cryptographic related :-).
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS		* 4. If you include any Windows specific code (or a derivative thereof) from
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)		* the apps directory (application code) you must include an acknowledgement:
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT		* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY		*
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF		* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
	SUCH DAMAGE.		* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
			* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	The licence and distribution terms for any publically available version or		* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	derivative of this code cannot be changed. i.e. this code cannot simply be		* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	copied and put under another distribution licence		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	[including the GNU Public Licence.]		* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
			* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	The reason behind this being stated in this direct manner is past		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	experience in code simply being copied and the attribution removed		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	from it and then being distributed as part of other packages. This		* SUCH DAMAGE.
	implementation was a non-trivial and unpaid effort.		*
			* The licence and distribution terms for any publically available version or
			* derivative of this code cannot be changed. i.e. this code cannot simply be
			* copied and put under another distribution licence
			* [including the GNU Public Licence.]
			*/