From 36939303c99ab97a62e117250b0d943885910b8f Mon Sep 17 00:00:00 2001 From: Nick Mathewson <nickm@torproject.org> Date: Wed, 8 Oct 2003 02:04:08 +0000 Subject: [PATCH] Update LICENSE and copyright dates. svn:r560 --- LICENSE | 174 +++++++-------------------------------- src/common/aes.c | 2 +- src/common/crypto.c | 2 +- src/common/crypto.h | 2 +- src/common/log.c | 2 +- src/common/test.h | 2 +- src/or/buffers.c | 2 +- src/or/circuit.c | 2 +- src/or/command.c | 2 +- src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/connection_or.c | 2 +- src/or/directory.c | 2 +- src/or/main.c | 2 +- src/or/onion.c | 2 +- src/or/or.h | 2 +- src/or/routers.c | 2 +- src/or/test.c | 2 +- src/or/tor_main.c | 2 +- 20 files changed, 49 insertions(+), 163 deletions(-) diff --git a/LICENSE b/LICENSE index feb8340938..405ece277b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,144 +1,30 @@ - -1) Tor is distributed under the terms of the GNU General Public -License. See the COPYING file for details. - -2) In addition, as a special exception, permission is granted to link -the code of this program with the OpenSSL library (or with modified -versions of OpenSSL that use the same license as OpenSSL - see below), -and distribute linked combinations including the two. You must obey the -GNU General Public License in all respects for all of the code used other -than OpenSSL. If you modify this file, you may extend this exception -to your version of the file, but you are not obligated to do so. If you -do not wish to do so, delete this exception statement from your version. - - - - --- OpenSSL LICENSE file follows -- - - 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-2000 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 - * 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. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 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 - * 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 - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED 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 OpenSSL PROJECT OR - * ITS 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. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * 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 - * 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 (tjh@cryptsoft.com). - * - * 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 (eay@cryptsoft.com)" - * 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 (tjh@cryptsoft.com)" - * - * 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.] - */ - +Copyright (c) 2001-2003, <OWNERS> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * 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. + + * Neither the name of the <ORGANIZATION> 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" 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 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/common/aes.c b/src/common/aes.c index 590d304837..ed3397ec40 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/common/crypto.c b/src/common/crypto.c index 9f83b56d3f..acdf7a06b7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/common/crypto.h b/src/common/crypto.h index 06269abab2..31e995d3bd 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/common/log.c b/src/common/log.c index a56a1e95be..313d08c359 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/common/test.h b/src/common/test.h index a22b8dd93e..7411d8f812 100644 --- a/src/common/test.h +++ b/src/common/test.h @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/buffers.c b/src/or/buffers.c index 98417a9272..71bff0007b 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/circuit.c b/src/or/circuit.c index b23b557013..ea901030c6 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/command.c b/src/or/command.c index 129dcfecb8..8648fcc6b3 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/config.c b/src/or/config.c index 496c575f38..3314e2c701 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/connection.c b/src/or/connection.c index b893a51861..faa701b03c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 82336e5fa4..d21d32541c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7819ca884e..663f301926 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/directory.c b/src/or/directory.c index c302dcdfc8..e3b7f14eac 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/main.c b/src/or/main.c index f66f2c68b1..efcae90bef 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/onion.c b/src/or/onion.c index 59149034ed..d62e8a4b2e 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/or.h b/src/or/or.h index 6c28c639fa..504a5e991f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/routers.c b/src/or/routers.c index 4e0ab24f86..e04d9c4adc 100644 --- a/src/or/routers.c +++ b/src/or/routers.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001-2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/test.c b/src/or/test.c index 3b6ff46501..1f733f4271 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ diff --git a/src/or/tor_main.c b/src/or/tor_main.c index aee77b9956..32f9b1d9de 100644 --- a/src/or/tor_main.c +++ b/src/or/tor_main.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */ +/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */ /* See LICENSE for licensing information */ /* $Id$ */ -- GitLab