summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-10-15 16:21:32 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-10-23 15:45:49 +0100
commit9bd3085e21273564033735eca808dccec0ddea40 (patch)
tree1e676a1e3cc5ec939337bc13a88c38cdf472406a /COPYING
parentcebe844419f6bd4b922de36b056e701740128ce4 (diff)
Use GChecksum for SHA-1 (with the same code as Gabble 0.7.12)
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING36
1 files changed, 0 insertions, 36 deletions
diff --git a/COPYING b/COPYING
index 191be910..e3819249 100644
--- a/COPYING
+++ b/COPYING
@@ -2,10 +2,6 @@ Most of Salut is licensed under the GNU Lesser General Public License,
as published by the Free Software Foundation and reproduced below:
either version 2.1 of the License, or (at your option) any later version.
-Salut incorporates a SHA1 implementation by Allan Saddi, taken from
-sha v1.0.4 (src/sha1/sha1.c and sha1.h). This is released under a BSD-style
-license also reproduced below.
-
xep.xsl in the the tools/ directory, used to generate HTML documentation
for the Clique protocol, is copyright 1999-2008 by the
XMPP Standards Foundation (XSF) and is released under a MIT-style
@@ -523,38 +519,6 @@ That's all there is to it!
------------------------------------------------------------------------
-License of src/sha1/sha1.[ch]:
-
-/*-
- * Copyright (c) 2001-2003 Allan Saddi <allan@saddi.com>
- * All rights reserved.
- *
- * 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.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS CONTRIBUTORS ``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 ALLAN SADDI OR HIS 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.
- *
- * $Id: sha1.h 347 2003-02-23 22:11:49Z asaddi $
- */
-
-------------------------------------------------------------------------
-
License of tools/xep.xsl:
Copyright (c) 1999 - 2008 XMPP Standards Foundation