commit 9f06d160d0091d2e9ba39efdf26c48e201efe811 Author: Zack Weinberg zackw@cmu.edu Date: Mon Apr 23 16:15:24 2012 -0700
Add/update copyright and licensing boilerplate on all files. --- LICENSE | 40 ++++++++-------------------------------- Makefile.am | 4 ++-- configure.ac | 4 ++++ scripts/benchmark-plot.R | 6 ++++++ scripts/benchmark.py | 6 ++++++ scripts/bm-fixedrate-cgi.c | 7 +++++++ scripts/bm-genfiles.py | 6 ++++++ scripts/bm-mcurl.c | 8 +++++++- scripts/bm-tor-controller.py | 6 ++++++ scripts/start-stegotorus.sh | 6 ++++++ src/audit-globals.sh | 2 ++ src/connections.cc | 7 ++++--- src/connections.h | 7 ++++--- src/crc32.cc | 3 +++ src/crc32.h | 4 ++++ src/crypt.cc | 7 ++++--- src/crypt.h | 8 ++++---- src/genmodtable.sh | 2 ++ src/listener.h | 5 ++--- src/main.cc | 5 +++-- src/main.h | 5 ++--- src/network.cc | 5 +++-- src/protocol.cc | 5 +++-- src/protocol.h | 5 +++-- src/protocol/chop.cc | 21 ++++++--------------- src/protocol/null.cc | 5 +++-- src/rng.cc | 7 ++++--- src/rng.h | 6 +++--- src/socks.cc | 5 +++-- src/socks.h | 5 ++--- src/steg.cc | 8 ++++---- src/steg.h | 7 +++---- src/steg/b64cookies.cc | 3 +++ src/steg/b64cookies.h | 4 ++++ src/steg/cookies.cc | 3 +++ src/steg/cookies.h | 6 ++++-- src/steg/embed.cc | 4 ++++ src/steg/http.cc | 36 +++--------------------------------- src/steg/jsSteg.cc | 4 ++++ src/steg/jsSteg.h | 4 ++++ src/steg/nosteg.cc | 36 +++--------------------------------- src/steg/nosteg_rr.cc | 36 +++--------------------------------- src/steg/payloads.cc | 4 ++++ src/steg/payloads.h | 4 ++++ src/steg/pdfSteg.cc | 4 ++++ src/steg/pdfSteg.h | 4 ++++ src/steg/swfSteg.cc | 3 +++ src/steg/swfSteg.h | 4 ++++ src/test/genunitgrps.sh | 2 ++ src/test/itestlib.py | 3 +++ src/test/test_socks.py | 3 +++ src/test/test_tl.py | 3 +++ src/test/tinytest.cc | 23 +---------------------- src/test/tinytest.h | 23 +---------------------- src/test/tinytest_macros.h | 24 ++---------------------- src/test/tl_oneway_c2s | 3 +++ src/test/tl_oneway_s2c | 3 +++ src/test/tl_snark | 2 ++ src/test/tltester.cc | 5 +++-- src/test/unittest.cc | 5 +++-- src/test/unittest.h | 7 ++++--- src/test/unittest_config.cc | 5 +++-- src/test/unittest_crypt.cc | 6 +++--- src/test/unittest_pdfsteg.cc | 3 ++- src/test/unittest_socks.cc | 5 +++-- src/test/unittest_transfer.cc | 5 +++-- src/util.cc | 6 +++--- src/util.h | 5 +++-- src/zpack.cc | 3 +++ src/zpack.h | 3 +++ 70 files changed, 246 insertions(+), 287 deletions(-)
diff --git a/LICENSE b/LICENSE index 05950d7..3bcae2b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ StegoTorus is Licensed under the 3-clause BSD license:
-Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg +Copyright 2009, 2010 Nick Mathewson +Copyright 2011 Nick Mathewson, George Kadianakis +Copyright 2011, 2012 SRI International
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -30,35 +32,9 @@ 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 src/test/tinytest* files are part of the "tinytest" unit test suite. -Their license: - - Copyright 2009-2010 Nick Mathewson - - 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. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 m4/pkg.m4 macro used by is distributed under GPLv2+ with autoconf -exemption. See m4/pkg.m4 for details. This license DOES NOT apply to the -generated configure file, or to any of stegotorus's code. +=====
+The files in m4/ and scripts/ each have their own individual copyright +and licensing, which may be more or less permissive than the above +license. However, those licenses DO NOT extend to the collective +work, the generated configure script, or to StegoTorus itself. diff --git a/Makefile.am b/Makefile.am index 7d72a96..11f8ac3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -# Makefile for stegotorus -# Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg +# Copyright 2011 Nick Mathewson, George Kadianakis +# Copyright 2011, 2012 SRI International # See LICENSE for other credits and copying information
ACLOCAL_AMFLAGS = -I m4 --install diff --git a/configure.ac b/configure.ac index 87cb713..647879a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,7 @@ +dnl Copyright 2011 Nick Mathewson, George Kadianakis +dnl Copyright 2011, 2012 SRI International +dnl See LICENSE for other credits and copying information +dnl AC_PREREQ([2.61])dnl Possibly earlier will do, but this is what I have AC_INIT([stegotorus], [0.0]) AC_CONFIG_SRCDIR([src/main.cc]) diff --git a/scripts/benchmark-plot.R b/scripts/benchmark-plot.R index 1ae178d..c586ac4 100644 --- a/scripts/benchmark-plot.R +++ b/scripts/benchmark-plot.R @@ -1,4 +1,10 @@ #! /usr/bin/Rscript +# Copyright 2012 Zachary Weinberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty.
suppressPackageStartupMessages({ library(plyr) diff --git a/scripts/benchmark.py b/scripts/benchmark.py index 8029f11..d9a4506 100755 --- a/scripts/benchmark.py +++ b/scripts/benchmark.py @@ -1,4 +1,10 @@ #! /usr/bin/python +# Copyright 2012 Zachary Weinberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty.
# Stegotorus benchmarking script. # Several different computers are involved: diff --git a/scripts/bm-fixedrate-cgi.c b/scripts/bm-fixedrate-cgi.c index 851cda7..8f4b31e 100644 --- a/scripts/bm-fixedrate-cgi.c +++ b/scripts/bm-fixedrate-cgi.c @@ -1,3 +1,10 @@ +/* Copyright 2012 Zachary Weinberg + * + * Copying and distribution of this file, with or without modification, are + * permitted in any medium without royalty provided the copyright notice + * and this notice are preserved. This file is offered as-is, without any + * warranty. + */ #define _XOPEN_SOURCE 600 #define _POSIX_C_SOURCE 200112
diff --git a/scripts/bm-genfiles.py b/scripts/bm-genfiles.py index dcd1030..57f3a65 100755 --- a/scripts/bm-genfiles.py +++ b/scripts/bm-genfiles.py @@ -1,4 +1,10 @@ #! /usr/bin/python +# Copyright 2012 Zachary Weinberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty.
"""Generate files for network performance testing.
diff --git a/scripts/bm-mcurl.c b/scripts/bm-mcurl.c index 7fb03a0..e7b75c5 100644 --- a/scripts/bm-mcurl.c +++ b/scripts/bm-mcurl.c @@ -1,4 +1,10 @@ -/* Use libcurl to retrieve many URLs, according to a wildcard pattern, +/* Copyright 2012 Zachary Weinberg + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. + + Use libcurl to retrieve many URLs, according to a wildcard pattern, starting new connections at a constant rate until we hit a limit.
Command line arguments -- all are required, but 'proxy' may be an diff --git a/scripts/bm-tor-controller.py b/scripts/bm-tor-controller.py index f10d8d2..e54038e 100755 --- a/scripts/bm-tor-controller.py +++ b/scripts/bm-tor-controller.py @@ -1,4 +1,10 @@ #! /usr/bin/python +# Copyright 2012 Zachary Weinberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty.
from torctl import TorCtl, TorUtil, PathSupport import sys diff --git a/scripts/start-stegotorus.sh b/scripts/start-stegotorus.sh index 9ea5be7..55f72fd 100644 --- a/scripts/start-stegotorus.sh +++ b/scripts/start-stegotorus.sh @@ -1,4 +1,10 @@ #!/bin/bash +# Copyright 2012 SRI International +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty.
################################################################################ # variables with default values diff --git a/src/audit-globals.sh b/src/audit-globals.sh index 3c21643..21d6633 100644 --- a/src/audit-globals.sh +++ b/src/audit-globals.sh @@ -1,4 +1,6 @@ #! /bin/sh +# Copyright 2012 SRI International +# See LICENSE for other credits and copying information
# Due to the multi-listener architecture of stegotorus, nearly all # global variables are bugs. This program enforces a white-list of diff --git a/src/connections.cc b/src/connections.cc index 39191b2..4f95d12 100644 --- a/src/connections.cc +++ b/src/connections.cc @@ -1,6 +1,7 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" diff --git a/src/connections.h b/src/connections.h index ddf787a..64a4252 100644 --- a/src/connections.h +++ b/src/connections.h @@ -1,6 +1,7 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#ifndef CONNECTIONS_H #define CONNECTIONS_H diff --git a/src/crc32.cc b/src/crc32.cc index 1b18544..151eae1 100644 --- a/src/crc32.cc +++ b/src/crc32.cc @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #include "util.h" #include "crc32.h"
diff --git a/src/crc32.h b/src/crc32.h index 0a1ee03..67bb48a 100644 --- a/src/crc32.h +++ b/src/crc32.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _CRC32_H #define _CRC32_H
diff --git a/src/crypt.cc b/src/crypt.cc index d964708..e60cc41 100644 --- a/src/crypt.cc +++ b/src/crypt.cc @@ -1,6 +1,7 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "crypt.h" diff --git a/src/crypt.h b/src/crypt.h index b3bbcfa..d7e5fbf 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -1,7 +1,7 @@ -/* Copyright 2011, 2012 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ - +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #ifndef CRYPT_H #define CRYPT_H
diff --git a/src/genmodtable.sh b/src/genmodtable.sh index c37b90e..8c922b3 100755 --- a/src/genmodtable.sh +++ b/src/genmodtable.sh @@ -1,4 +1,6 @@ #! /bin/sh +# Copyright 2011 SRI International +# See LICENSE for other credits and copying information
set -e
diff --git a/src/listener.h b/src/listener.h index 4fac10a..6a73d1d 100644 --- a/src/listener.h +++ b/src/listener.h @@ -1,7 +1,6 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ - + * See LICENSE for other credits and copying information + */ #ifndef LISTENER_H #define LISTENER_H
diff --git a/src/main.cc b/src/main.cc index 1c8e55f..8c1407f 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "main.h" diff --git a/src/main.h b/src/main.h index 8814499..5786569 100644 --- a/src/main.h +++ b/src/main.h @@ -1,7 +1,6 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ - + * See LICENSE for other credits and copying information + */ #ifndef MAIN_H #define MAIN_H
diff --git a/src/network.cc b/src/network.cc index fb17e99..6039df0 100644 --- a/src/network.cc +++ b/src/network.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "listener.h" diff --git a/src/protocol.cc b/src/protocol.cc index cb8db24..e63b6c2 100644 --- a/src/protocol.cc +++ b/src/protocol.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "protocol.h" diff --git a/src/protocol.h b/src/protocol.h index 4f0d6cd..fbc459e 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#ifndef PROTOCOL_H #define PROTOCOL_H diff --git a/src/protocol/chop.cc b/src/protocol/chop.cc index dac4ea2..5451925 100644 --- a/src/protocol/chop.cc +++ b/src/protocol/chop.cc @@ -1,9 +1,6 @@ -/* Copyright 2011, 2012 Zack Weinberg - See LICENSE for other credits and copying information - - The chopper is the core StegoTorus protocol implementation. - For its design, see doc/chopper.txt. Note that it is still - being implemented, and may change incompatibly. */ +/* Copyright 2011, SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" @@ -19,9 +16,9 @@ #include <event2/event.h> #include <event2/buffer.h>
-#ifdef HAVE_EXECINFO_H -#include <execinfo.h> -#endif +/* The chopper is the core StegoTorus protocol implementation. + For its design, see doc/chopper.txt. Note that it is still + being implemented, and may change incompatibly. */
using std::tr1::unordered_map; using std::tr1::unordered_set; @@ -557,12 +554,6 @@ chop_circuit_t::~chop_circuit_t() sent_fin ? '+' : '-', received_fin ? '+' : '-', upstream_eof ? '+' : '-', (unsigned long)downstreams.size()); -#ifdef HAVE_EXECINFO_H - int n; - void *backtracebuf[256]; - n = backtrace(backtracebuf, sizeof backtracebuf / sizeof(void*)); - backtrace_symbols_fd(backtracebuf, n, 2); -#endif }
for (unordered_set<chop_conn_t *>::iterator i = downstreams.begin(); diff --git a/src/protocol/null.cc b/src/protocol/null.cc index 277eb59..90abec2 100644 --- a/src/protocol/null.cc +++ b/src/protocol/null.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" diff --git a/src/rng.cc b/src/rng.cc index cfddd87..b76ba79 100644 --- a/src/rng.cc +++ b/src/rng.cc @@ -1,6 +1,7 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "rng.h" diff --git a/src/rng.h b/src/rng.h index 5cc0a5a..b34012c 100644 --- a/src/rng.h +++ b/src/rng.h @@ -1,6 +1,6 @@ -/* Copyright 2011 Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#ifndef RNG_H #define RNG_H diff --git a/src/socks.cc b/src/socks.cc index 05da3f4..7203683 100644 --- a/src/socks.cc +++ b/src/socks.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h"
diff --git a/src/socks.h b/src/socks.h index c22b1bb..3d28568 100644 --- a/src/socks.h +++ b/src/socks.h @@ -1,7 +1,6 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ - + * See LICENSE for other credits and copying information + */ #ifndef SOCKS_H #define SOCKS_H
diff --git a/src/steg.cc b/src/steg.cc index 12ea291..ee9a1a1 100644 --- a/src/steg.cc +++ b/src/steg.cc @@ -1,6 +1,6 @@ -/* Copyright 2011 Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "steg.h" @@ -24,7 +24,7 @@ steg_new(const char *name, config_t *cfg) const steg_module *const *s; for (s = supported_stegs; *s; s++) if (!strcmp(name, (**s).name)) - return (**s).new_(cfg); + return (**s).new_(cfg); return 0; }
diff --git a/src/steg.h b/src/steg.h index ad6b829..fe8ef5e 100644 --- a/src/steg.h +++ b/src/steg.h @@ -1,7 +1,6 @@ -/* Copyright 2011 Zack Weinberg - See LICENSE for other credits and copying information -*/ - +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #ifndef STEG_H #define STEG_H
diff --git a/src/steg/b64cookies.cc b/src/steg/b64cookies.cc index d0268be..b75bedc 100644 --- a/src/steg/b64cookies.cc +++ b/src/steg/b64cookies.cc @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "b64cookies.h"
diff --git a/src/steg/b64cookies.h b/src/steg/b64cookies.h index 2ce40f4..1556cdd 100644 --- a/src/steg/b64cookies.h +++ b/src/steg/b64cookies.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _B64_COOKIES_H #define _B64_COOKIES_H
diff --git a/src/steg/cookies.cc b/src/steg/cookies.cc index aa2d108..885c8cb 100644 --- a/src/steg/cookies.cc +++ b/src/steg/cookies.cc @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "cookies.h"
diff --git a/src/steg/cookies.h b/src/steg/cookies.h index abda927..a7ed856 100644 --- a/src/steg/cookies.h +++ b/src/steg/cookies.h @@ -1,8 +1,10 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _COOKIES_H #define _COOKIES_H
- - #include <stdio.h> #include <strings.h> #include <stdlib.h> diff --git a/src/steg/embed.cc b/src/steg/embed.cc index d301620..327c7c4 100644 --- a/src/steg/embed.cc +++ b/src/steg/embed.cc @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #include "util.h" #include "connections.h" #include "protocol.h" diff --git a/src/steg/http.cc b/src/steg/http.cc index a41afb8..7267e6f 100644 --- a/src/steg/http.cc +++ b/src/steg/http.cc @@ -1,36 +1,6 @@ -/* Copyright (c) 2011, SRI International - -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. - - Contributors: Zack Weinberg, Vinod Yegneswaran - See LICENSE for other credits and copying information -*/ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" diff --git a/src/steg/jsSteg.cc b/src/steg/jsSteg.cc index 06d31e4..7cfd056 100644 --- a/src/steg/jsSteg.cc +++ b/src/steg/jsSteg.cc @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #include "payloads.h" #include "jsSteg.h" #include "cookies.h" diff --git a/src/steg/jsSteg.h b/src/steg/jsSteg.h index 709ceb0..576f91f 100644 --- a/src/steg/jsSteg.h +++ b/src/steg/jsSteg.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _JSSTEG_H #define _JSSTEG_H
diff --git a/src/steg/nosteg.cc b/src/steg/nosteg.cc index 328a1d6..8b8bf70 100644 --- a/src/steg/nosteg.cc +++ b/src/steg/nosteg.cc @@ -1,36 +1,6 @@ -/* Copyright (c) 2011, SRI International - -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. - - Contributors: Zack Weinberg, Vinod Yegneswaran - See LICENSE for other credits and copying information -*/ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" diff --git a/src/steg/nosteg_rr.cc b/src/steg/nosteg_rr.cc index adde6c8..6719584 100644 --- a/src/steg/nosteg_rr.cc +++ b/src/steg/nosteg_rr.cc @@ -1,36 +1,6 @@ -/* Copyright (c) 2011, SRI International - -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. - - Contributors: Zack Weinberg, Vinod Yegneswaran - See LICENSE for other credits and copying information -*/ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "connections.h" diff --git a/src/steg/payloads.cc b/src/steg/payloads.cc index f5f35b8..d24711f 100644 --- a/src/steg/payloads.cc +++ b/src/steg/payloads.cc @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #include "util.h" #include "payloads.h" #include "swfSteg.h" diff --git a/src/steg/payloads.h b/src/steg/payloads.h index 05a7307..cb809ba 100644 --- a/src/steg/payloads.h +++ b/src/steg/payloads.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _PAYLOADS_H #define _PAYLOADS_H
diff --git a/src/steg/pdfSteg.cc b/src/steg/pdfSteg.cc index 3b4bbf0..658c319 100644 --- a/src/steg/pdfSteg.cc +++ b/src/steg/pdfSteg.cc @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #include "util.h" #include "pdfSteg.h" #include "connections.h" diff --git a/src/steg/pdfSteg.h b/src/steg/pdfSteg.h index 0bd3a43..0b295b1 100644 --- a/src/steg/pdfSteg.h +++ b/src/steg/pdfSteg.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _PDFSTEG_H #define _PDFSTEG_H
diff --git a/src/steg/swfSteg.cc b/src/steg/swfSteg.cc index c8a18c1..4358fe3 100644 --- a/src/steg/swfSteg.cc +++ b/src/steg/swfSteg.cc @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #include "util.h" #include "swfSteg.h" #include "connections.h" diff --git a/src/steg/swfSteg.h b/src/steg/swfSteg.h index b8336b2..938b05a 100644 --- a/src/steg/swfSteg.h +++ b/src/steg/swfSteg.h @@ -1,3 +1,7 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ + #ifndef _SWFSTEG_H #define _SWFSTEG_H
diff --git a/src/test/genunitgrps.sh b/src/test/genunitgrps.sh index 63b9df7..d051e8e 100644 --- a/src/test/genunitgrps.sh +++ b/src/test/genunitgrps.sh @@ -1,4 +1,6 @@ #! /bin/sh +# Copyright 2011 SRI International +# See LICENSE for other credits and copying information
set -e
diff --git a/src/test/itestlib.py b/src/test/itestlib.py index 1c483f3..90b1906 100644 --- a/src/test/itestlib.py +++ b/src/test/itestlib.py @@ -1,3 +1,6 @@ +# Copyright 2011, 2012 SRI International +# See LICENSE for other credits and copying information + # Integration tests for stegotorus - library routines.
import difflib diff --git a/src/test/test_socks.py b/src/test/test_socks.py index d71da5e..b6c66e2 100644 --- a/src/test/test_socks.py +++ b/src/test/test_socks.py @@ -1,3 +1,6 @@ +# Copyright 2011, 2012 SRI International +# See LICENSE for other credits and copying information + # Integration tests for stegotorus - socks mode.
import re diff --git a/src/test/test_tl.py b/src/test/test_tl.py index eb61f31..46e5d5a 100644 --- a/src/test/test_tl.py +++ b/src/test/test_tl.py @@ -1,3 +1,6 @@ +# Copyright 2011, 2012 SRI International +# See LICENSE for other credits and copying information + # Integration tests for stegotorus - "timeline" tests. # # These tests use the 'tltester' utility to script a sequence of diff --git a/src/test/tinytest.cc b/src/test/tinytest.cc index 03ffd0d..21d14ee 100644 --- a/src/test/tinytest.cc +++ b/src/test/tinytest.cc @@ -1,26 +1,5 @@ /* tinytest.c -- Copyright 2009-2010 Nick Mathewson - * - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * See LICENSE for other credits and copying information */
#include "tinytest_macros.h" diff --git a/src/test/tinytest.h b/src/test/tinytest.h index 2db71e9..1a995b9 100644 --- a/src/test/tinytest.h +++ b/src/test/tinytest.h @@ -1,26 +1,5 @@ /* tinytest.h -- Copyright 2009-2010 Nick Mathewson - * - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * See LICENSE for other credits and copying information */
#ifndef _TINYTEST_H diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index cf5a2a2..00d8732 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -1,26 +1,6 @@ /* tinytest_macros.h -- Copyright 2009-2010 Nick Mathewson - * - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information */
#ifndef _TINYTEST_MACROS_H diff --git a/src/test/tl_oneway_c2s b/src/test/tl_oneway_c2s index 994ed59..6718112 100644 --- a/src/test/tl_oneway_c2s +++ b/src/test/tl_oneway_c2s @@ -1,3 +1,6 @@ +# Copyright 2011 SRI International +# See LICENSE for other credits and copying information +# # lots of client-to-server, no server-to-client
I
diff --git a/src/test/tl_oneway_s2c b/src/test/tl_oneway_s2c index a286b46..a9ec7c4 100644 --- a/src/test/tl_oneway_s2c +++ b/src/test/tl_oneway_s2c @@ -1,3 +1,6 @@ +# Copyright 2011 SRI International +# See LICENSE for other credits and copying information +# # lots of server-to-client, no client-to-server
< I diff --git a/src/test/tl_snark b/src/test/tl_snark index 95e8b88..a5e785a 100644 --- a/src/test/tl_snark +++ b/src/test/tl_snark @@ -1,3 +1,5 @@ +# All significant creative work in this file was done by +# Lewis Carroll, and is in the public domain. Text derived # from http://www.gutenberg.org/files/13/13-h/13-h.htm
Fit the First
diff --git a/src/test/tltester.cc b/src/test/tltester.cc index ca4c9b5..3876ef7 100644 --- a/src/test/tltester.cc +++ b/src/test/tltester.cc @@ -1,5 +1,6 @@ -/* Copyright 2011 Zack Weinberg - See LICENSE for other credits and copying information. */ +/* Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h"
diff --git a/src/test/unittest.cc b/src/test/unittest.cc index d09c2a6..cba4906 100644 --- a/src/test/unittest.cc +++ b/src/test/unittest.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/test/unittest.h b/src/test/unittest.h index 9efe27b..81c873a 100644 --- a/src/test/unittest.h +++ b/src/test/unittest.h @@ -1,6 +1,7 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis, Zack Weinberg - See LICENSE for other credits and copying information -*/ +/* Copyright 2011 Nick Mathewson, George Kadianakis + * Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#ifndef UNITTEST_H #define UNITTEST_H diff --git a/src/test/unittest_config.cc b/src/test/unittest_config.cc index 58571e9..72b39bd 100644 --- a/src/test/unittest_config.cc +++ b/src/test/unittest_config.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/test/unittest_crypt.cc b/src/test/unittest_crypt.cc index 0053646..c411386 100644 --- a/src/test/unittest_crypt.cc +++ b/src/test/unittest_crypt.cc @@ -1,6 +1,6 @@ -/* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/test/unittest_pdfsteg.cc b/src/test/unittest_pdfsteg.cc index cf9e97d..36a1167 100644 --- a/src/test/unittest_pdfsteg.cc +++ b/src/test/unittest_pdfsteg.cc @@ -1,5 +1,6 @@ /* Copyright 2011, 2012 SRI International - See LICENSE for other credits and copying information */ + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/test/unittest_socks.cc b/src/test/unittest_socks.cc index 84c256b..0dbfdc5 100644 --- a/src/test/unittest_socks.cc +++ b/src/test/unittest_socks.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/test/unittest_transfer.cc b/src/test/unittest_transfer.cc index d1a7bbf..de17ed0 100644 --- a/src/test/unittest_transfer.cc +++ b/src/test/unittest_transfer.cc @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011 SRI International + * See LICENSE for other credits and copying information + */
#include "util.h" #include "unittest.h" diff --git a/src/util.cc b/src/util.cc index a667abd..c94275c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,7 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ - + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #include "util.h" #include "connections.h"
diff --git a/src/util.h b/src/util.h index 167af8e..62908d1 100644 --- a/src/util.h +++ b/src/util.h @@ -1,6 +1,7 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis - See LICENSE for other credits and copying information -*/ + * Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */
#ifndef UTIL_H #define UTIL_H diff --git a/src/zpack.cc b/src/zpack.cc index c3c650f..751c96e 100644 --- a/src/zpack.cc +++ b/src/zpack.cc @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #include "util.h" #include "zpack.h" #include "zlib.h" diff --git a/src/zpack.h b/src/zpack.h index 5d3f82f..18bb531 100644 --- a/src/zpack.h +++ b/src/zpack.h @@ -1,3 +1,6 @@ +/* Copyright 2011, 2012 SRI International + * See LICENSE for other credits and copying information + */ #ifndef _ZPACK_H #define _ZPACK_H