forked from openssl/openssl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleaned up the LICENSE document: The official contact for any license
questions now is the OpenSSL core team under [email protected]. 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.
- Loading branch information
Ralf S. Engelschall
committed
Mar 6, 1999
1 parent
0de6fd7
commit 0b903ec
Showing
2 changed files
with
79 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,13 @@ | |
|
|
||
| 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 [email protected]. | ||
| 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...' | ||
| display consistent in the source tree and replaced `/bin/rm' by `rm'. | ||
| Additonally cleaned up the `make links' target: Remove unnecessary | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 [email protected]. | ||
|
|
||
| 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 | ||
| * 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 | ||
| * endorse or promote products derived from this software without | ||
| * prior written permission. For written permission, please contact | ||
| * [email protected]. | ||
| * openssl-core@openssl.org. | ||
| * | ||
| * 5. Products derived from this software may not be called "OpenSSL" | ||
| * nor may "OpenSSL" appear in their names without prior written | ||
|
|
@@ -52,73 +64,64 @@ | |
| * Hudson ([email protected]). | ||
| * | ||
| */ | ||
| __________________________________________________________________________ | ||
|
|
||
| Original SSLeay License | ||
| __________________________________________________________________________ | ||
|
|
||
| Copyright (C) 1997 Eric Young ([email protected]) | ||
| All rights reserved. | ||
|
|
||
| This package is an SSL implementation written by Eric Young ([email protected]). | ||
| 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 ([email protected]). | ||
|
|
||
| Please note that MD2, MD5 and IDEA are publically available standards | ||
| that contain sample implementations, I have re-coded them in my own | ||
| way but there is nothing special about those implementations. The DES | ||
| library is another mater :-). | ||
|
|
||
| Copyright remains Eric Young's, and as such any Copyright notices in | ||
| the code are not to be removed. | ||
| If this package is used in a product, Eric Young should be given attribution | ||
| as the author of the parts of the library used. | ||
| This can be in the form of a textual message at program startup or | ||
| in documentation (online or textual) provided with the package. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
| 1. Redistributions of source code must retain the copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| 3. All advertising materials mentioning features or use of this software | ||
| must display the following acknowledgement: | ||
| "This product includes cryptographic software written by | ||
| Eric Young ([email protected])" | ||
| The word 'cryptographic' can be left out if the rouines from the library | ||
| being used are not cryptographic related :-). | ||
| 4. If you include any Windows specific code (or a derivative thereof) from | ||
| the apps directory (application code) you must include an acknowledgement: | ||
| "This product includes software written by Tim Hudson ([email protected])" | ||
| Original SSLeay License | ||
| ----------------------- | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 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 | ||
| SUCH DAMAGE. | ||
|
|
||
| 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. | ||
| /* Copyright (C) 1995-1998 Eric Young ([email protected]) | ||
| * All rights reserved. | ||
| * | ||
| * This package is an SSL implementation written | ||
| * by Eric Young ([email protected]). | ||
| * 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 ([email protected]). | ||
| * | ||
| * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| * the code are not to be removed. | ||
| * If this package is used in a product, Eric Young should be given attribution | ||
| * as the author of the parts of the library used. | ||
| * This can be in the form of a textual message at program startup or | ||
| * in documentation (online or textual) provided with the package. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * 3. All advertising materials mentioning features or use of this software | ||
| * must display the following acknowledgement: | ||
| * "This product includes cryptographic software written by | ||
| * Eric Young ([email protected])" | ||
| * The word 'cryptographic' can be left out if the rouines from the library | ||
| * being used are not cryptographic related :-). | ||
| * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| * the apps directory (application code) you must include an acknowledgement: | ||
| * "This product includes software written by Tim Hudson ([email protected])" | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| * 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 | ||
| * SUCH DAMAGE. | ||
| * | ||
| * 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.] | ||
| */ | ||
|
|
||