summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlna <vlna@users.noreply.github.com>2016-06-18 12:28:34 +0200
committerBrian Turek <brian.turek@gmail.com>2016-06-18 06:28:34 -0400
commit49c9b2eaf5f35b9a7b67909ff4ec1f16b91cc3e4 (patch)
treef22c388c6ba888fa5fab0d7ce3a93572f94aa79d
parent28fe708c1913b7902876bb6228d6d9827dab38c7 (diff)
downloadjsSHA-49c9b2eaf5f35b9a7b67909ff4ec1f16b91cc3e4.zip
jsSHA-49c9b2eaf5f35b9a7b67909ff4ec1f16b91cc3e4.tar.gz
jsSHA-49c9b2eaf5f35b9a7b67909ff4ec1f16b91cc3e4.tar.bz2
Copyright notice and license for P.Johnston's code (#48)
Copyright notice and license for P.Johnston's code
-rw-r--r--LICENSE28
1 files changed, 19 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index b5a0cda..ce8fda6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,16 +9,26 @@ modification, are permitted provided that the following conditions are met:
* 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.
- * The names of the contributors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
+ * Neither the name of the author nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-ANDANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.IN NO EVENT SHALL THE COPYRIGHT OWNER 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 OFLIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+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 COPYRIGHT OWNER 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 NEGLIGENCEOR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISEDOF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
+Portions of this software are derived from code under the same license and
+
+Copyright (c) 1998 - 2009, Paul Johnston & Contributors
+All rights reserved.
+
+Original code is available on http://pajhome.org.uk/crypt/md5