commit c8fa95d3b686c55b37e77502077514abb1ab8b09 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 10 16:32:44 2011 -0400 Switch to 3bsd license with permission from asn --- LICENSE | 34 +++++++++++++++++++++++++++++----- src/main.c | 7 ++----- src/network.c | 7 ++----- src/network.h | 7 ++----- src/protocol.c | 4 ++++ src/protocol.h | 4 ++++ src/protocols/dummy.c | 3 +++ src/protocols/dummy.h | 3 +++ src/protocols/obfs2.c | 7 ++----- src/protocols/obfs2.h | 7 ++----- src/protocols/obfs2_crypt.c | 7 ++----- src/protocols/obfs2_crypt.h | 7 ++----- src/socks.c | 4 ++++ src/socks.h | 4 ++++ src/test/unittest.c | 7 ++----- src/test/unittest_crypt.c | 7 ++----- src/test/unittest_obfs2.c | 7 ++----- src/test/unittest_socks.c | 3 +++ src/util.c | 7 ++----- src/util.h | 7 ++----- 20 files changed, 78 insertions(+), 65 deletions(-) diff --git a/LICENSE b/LICENSE index 6d5e05f..c9dcec5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,10 +1,34 @@ -Obfsproxy is distributed under the Tiny License: +Obfsproxy is Licensed under the 3-clause BSD license: - Copyright 2011 Nick Mathewson +Copyright 2011 Nick Mathewson - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +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 names of the copyright owners 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. ======== src/sha256.c is based on public-domain code in LibTomCrypt, modified by the Tor diff --git a/src/main.c b/src/main.c index cebf14b..ace9e8c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdlib.h> diff --git a/src/network.c b/src/network.c index f2410ce..e3c2fa0 100644 --- a/src/network.c +++ b/src/network.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #define NETWORK_PRIVATE diff --git a/src/network.h b/src/network.h index 72a02ab..2a1daeb 100644 --- a/src/network.h +++ b/src/network.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef NETWORK_H diff --git a/src/protocol.c b/src/protocol.c index 32d8d0d..544dcef 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <stdlib.h> #include <stdio.h> #include <assert.h> diff --git a/src/protocol.h b/src/protocol.h index 69ea4aa..ceae438 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <event2/buffer.h> #ifndef PROTOCOL_H diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index bbda22f..bdf97fc 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #include <assert.h> #include <string.h> #include <stdlib.h> diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index a00248f..654e0a2 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #ifndef DUMMY_H #define DUMMY_H diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index d84d3ae..676ddd7 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <assert.h> diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index d206bc8..608ae7a 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef OBFS2_H diff --git a/src/protocols/obfs2_crypt.c b/src/protocols/obfs2_crypt.c index 57f511b..681fab6 100644 --- a/src/protocols/obfs2_crypt.c +++ b/src/protocols/obfs2_crypt.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include "config.h" diff --git a/src/protocols/obfs2_crypt.h b/src/protocols/obfs2_crypt.h index ef279e9..b449047 100644 --- a/src/protocols/obfs2_crypt.h +++ b/src/protocols/obfs2_crypt.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef OBFS2_CRYPT_H diff --git a/src/socks.c b/src/socks.c index 626ba88..7cf179b 100644 --- a/src/socks.c +++ b/src/socks.c @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> diff --git a/src/socks.h b/src/socks.h index f686253..caa7ec0 100644 --- a/src/socks.h +++ b/src/socks.h @@ -1,3 +1,7 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + #ifndef SOCKS_H #define SOCKS_H diff --git a/src/test/unittest.c b/src/test/unittest.c index 41159ca..8ff3747 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdlib.h> diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index 5980636..b50d65d 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdio.h> #include <stdlib.h> diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index dd51762..62a2ff3 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <stdio.h> #include <stdlib.h> diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 38b124a..c85fcf9 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -1,3 +1,6 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util.c b/src/util.c index 976dd59..d4eddb6 100644 --- a/src/util.c +++ b/src/util.c @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #include <string.h> diff --git a/src/util.h b/src/util.h index af3cd88..2705d51 100644 --- a/src/util.h +++ b/src/util.h @@ -1,8 +1,5 @@ -/* Copyright 2011 Nick Mathewson - - You may do anything with this work that copyright law would normally - restrict, so long as you retain the above notice(s) and this license - in all redistributed copies and derived works. There is no warranty. +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information */ #ifndef UTIL_H