diff options
| author | lloyd <[email protected]> | 2009-07-25 12:01:29 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-07-25 12:01:29 +0000 |
| commit | 26fa799af0d362a37a80e1c666e738d3674fc25e (patch) | |
| tree | ad41cb890c8c7ebc7ab1c51b16a34694550e2014 | |
| parent | efa7cabca1fe897d10f3c4addeb7739fa81e47a2 (diff) | |
Minor changes to the license.
Remove the phrase 'for any use' - implied by the conditions.
Add 'All rights reserved.' after the (C) notice.
Remove the name+URL in the text and lead off with a statement that
Botan is distributed under the following terms: <blah>
Combine the two all-CAPS sentences disclaiming warranty into a single
paragraph.
The main reasoning behind this is to make the actual license text
totally equivalent to the FreeBSD/NetBSD licenses, which is an offical
Open Source(tm) license as declared by the OSI.
| -rw-r--r-- | doc/license.txt | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/doc/license.txt b/doc/license.txt index 4c3fc1999..9d1067cc1 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -1,3 +1,5 @@ +Botan (http://botan.randombit.net/) is distributed under these terms: + Copyright (C) 1999-2009 Jack Lloyd 2001 Peter J Jones 2004-2007 Justin Karneges @@ -12,10 +14,11 @@ Copyright (C) 1999-2009 Jack Lloyd 2007 Manuel Hartl 2007 Christoph Ludwig 2007 Patrick Sona +All rights reserved. -Redistribution and use in source and binary forms, for any use, with -or without modification, of Botan (http://botan.randombit.net/) is -permitted provided that the following conditions are met: +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 above copyright notice, this list of conditions, and the following disclaimer. @@ -27,13 +30,11 @@ documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "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(S) OR CONTRIBUTOR(S) 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. +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) 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. |