generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up the LICENSE document: The official contact for any license

Browse Source 
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.
This commit is contained in:
Ralf S. Engelschall 1999-03-06 13:29:09 +00:00
parent 0de6fd7361
commit 0b903ec018
2 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@ -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

139
LICENSE
View File

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