Merge lp:~hipl-core/hipl/hip-checksum into lp:hipl

[Miika Komu]

In order to change the copyright of checksum.c, should we retain the copyright boilerplates in a single file or should we split the checksum file (articially) into multiple files each with different copyright information?

[Diego Biurrun (diego-biurrun)]

 review needs-fixing

On Sat, Jun 01, 2013 at 06:39:25PM -0000, Miika Komu wrote:
>
> For more details, see:
> https://code.launchpad.net/~hipl-core/hipl/hip-checksum/+merge/166947
>
> In order to change the copyright of checksum.c, should we retain
> the copyright boilerplates in a single file or should we split the
> checksum file (articially) into multiple files each with different
> copyright information?

Whatever you prefer.

What is the WIDE project? Also note that the last two copyright statements
are the same BSD 3-clause license.

> --- Makefile.am 2013-03-25 06:43:57 +0000
> +++ Makefile.am 2013-06-01 18:38:25 +0000
> @@ -158,7 +158,7 @@
> libcore/straddr.c \
> libcore/transform.c \
> - libcore/gpl/checksum.c \
> + libcore/checksum.c \
> libcore/gpl/nlink.c \
> libcore/gpl/pk.c \
> @@ -233,7 +233,7 @@
> test/libcore/solve.c \
> test/libcore/straddr.c \
> - test/libcore/gpl/checksum.c \
> + test/libcore/checksum.c \
> test/libcore/gpl/pk.c \
> test/libcore/modules/midauth_builder.c

These were previously in alphabetical order.

> --- hipfw/reinject.c 2012-05-12 06:54:33 +0000
> +++ hipfw/reinject.c 2013-06-01 18:38:25 +0000
> @@ -1,5 +1,5 @@
> /*
> - * Copyright (c) 2010 Aalto University and RWTH Aachen University.
> + * Copyright (c) 2010, 2013 Aalto University and RWTH Aachen University.
> *
> * Permission is hereby granted, free of charge, to any person
> * obtaining a copy of this software and associated documentation
> @@ -45,7 +45,7 @@
> #include "libcore/debug.h"
> #include "libcore/ife.h"
> #include "libcore/prefix.h"
> -#include "libcore/gpl/checksum.h"
> +#include "libcore/checksum.h"
> #include "reinject.h"

I wouldn't bother changing the copyright statement for such silly
mechanical changes that are not copyrightable anyway.

> --- hipfw/rewrite.c 2012-05-12 06:54:33 +0000
> +++ hipfw/rewrite.c 2013-06-01 18:38:25 +0000
> @@ -54,7 +54,6 @@
> * more thoroughly, these optimizations should be considered hacks (and
> * are thus not used here).
> *
> - * @author Christof Mroz <email address hidden>
> */

This seems unrelated.

> --- hipfw/user_ipsec_esp.c 2013-01-27 15:57:14 +0000
> +++ hipfw/user_ipsec_esp.c 2013-06-01 18:38:25 +0000
> @@ -42,7 +42,7 @@
> #include "libcore/ife.h"
> #include "libcore/keylen.h"
> #include "libcore/prefix.h"
> -#include "libcore/gpl/checksum.h"
> +#include "libcore/checksum.h"
> #include "esp_prot_api.h"
> #include "hipfw_defines.h"
> #include "user_ipsec_sadb.h"

Here you don't change the copyright statement.

Diego

review: Needs Fixing

[lp:~hipl-core/hipl/hip-checksum]

6418. By Miika Komu on 2013-06-01

Minor fixes according to the code review

Some clean ups to the code according to the mailing list code review:
* Join the two BSD copyright statements into a single one
* Files are now again in alphabetical order in Makefile.am
* Removed some unrelated changes
* Updated the year in the ipsec copyright statement

6419. By Miika Komu on 2013-06-01

Updated the year in the ipsec copyright statement

Forgot to commit this in the previous commit

6420. By Miika Komu on 2013-06-17

Synchronized with trunk revision 6419.

6421. By Miika Komu on 2013-08-08

Synchronized with trunk revision 6425

6422. By Miika Komu on 2013-08-08

Fixed a copyright in boilerplate

Fixed an unneccessary copyright change (just minor changes in the file)

Unmerged revisions

=== modified file 'Makefile.am'
--- Makefile.am	2013-03-25 06:43:57 +0000
+++ Makefile.am	2013-06-01 20:15:30 +0000
@@ -135,6 +135,7 @@
                              libcore/capability.c                       \
                              libcore/cert.c                             \
                              libcore/certtools.c                        \
+                             libcore/checksum.c                         \
                              libcore/conf.c                             \
                              libcore/crypto.c                           \
                              libcore/debug.c                            \
@@ -158,7 +159,6 @@
                              libcore/statistics.c                       \
                              libcore/straddr.c                          \
                              libcore/transform.c                        \
-                             libcore/gpl/checksum.c                     \
                              libcore/gpl/nlink.c                        \
                              libcore/gpl/pk.c                           \
                              libcore/gpl/xfrmapi.c                      \
@@ -233,7 +233,7 @@
                              test/libcore/hostid.c                      \
                              test/libcore/solve.c                       \
                              test/libcore/straddr.c                     \
-                             test/libcore/gpl/checksum.c                \
+                             test/libcore/checksum.c                    \
                              test/libcore/gpl/pk.c                      \
                              test/libcore/modules/midauth_builder.c
 

=== modified file 'hipfw/reinject.c'
--- hipfw/reinject.c	2012-05-12 06:54:33 +0000
+++ hipfw/reinject.c	2013-06-01 20:15:30 +0000
@@ -45,7 +45,7 @@
 #include "libcore/debug.h"
 #include "libcore/ife.h"
 #include "libcore/prefix.h"
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "reinject.h"
 
 static int firewall_raw_sock_tcp_v4        = 0;

=== modified file 'hipfw/rewrite.c'
--- hipfw/rewrite.c	2012-05-12 06:54:33 +0000
+++ hipfw/rewrite.c	2013-06-01 20:15:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Aalto University and RWTH Aachen University.
+ * Copyright (c) 2011, 2013 Aalto University and RWTH Aachen University.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -68,7 +68,7 @@
 
 #include "libcore/builder.h"
 #include "libcore/debug.h"
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "rewrite.h"
 
 // static configuration

=== modified file 'hipfw/user_ipsec_esp.c'
--- hipfw/user_ipsec_esp.c	2013-01-27 15:57:14 +0000
+++ hipfw/user_ipsec_esp.c	2013-06-01 20:15:30 +0000
@@ -1,6 +1,6 @@
 /*
  * Host Identity Protocol
- * Copyright (c) 2004-2012 the Boeing Company
+ * Copyright (c) 2004-2013 the Boeing Company
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,7 +42,7 @@
 #include "libcore/ife.h"
 #include "libcore/keylen.h"
 #include "libcore/prefix.h"
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "esp_prot_api.h"
 #include "hipfw_defines.h"
 #include "user_ipsec_sadb.h"

=== modified file 'libcore/builder.c'
--- libcore/builder.c	2012-07-13 13:16:17 +0000
+++ libcore/builder.c	2013-06-01 20:15:30 +0000
@@ -94,7 +94,7 @@
 #include <arpa/inet.h>
 #include <openssl/md5.h>
 
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "common.h"
 #include "config.h"
 #include "crypto.h"

=== renamed file 'libcore/gpl/checksum.c' => 'libcore/checksum.c'
--- libcore/gpl/checksum.c	2013-06-01 18:15:24 +0000
+++ libcore/checksum.c	2013-06-01 20:15:30 +0000
@@ -1,11 +1,56 @@
-/**
- * @file
- *
- * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt">GNU/GPL</a>
- *
- * @brief Checksum functions
- *
- * @note check if some of the checksum algos are redundant
+/*
+ * Host Identity Protocol
+ * Copyright (c) 2002-2013 the Boeing Company
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+/*-
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * Copyright (c) 1988, 1992, 1993 the Regents of the University of California.
+ * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
+ *
  */
 
 #define _BSD_SOURCE

=== renamed file 'libcore/gpl/checksum.h' => 'libcore/checksum.h'
=== modified file 'libhipl/output.c'
--- libhipl/output.c	2012-06-07 12:45:16 +0000
+++ libhipl/output.c	2013-06-01 20:15:30 +0000
@@ -53,7 +53,7 @@
 #include "libcore/prefix.h"
 #include "libcore/protodefs.h"
 #include "libcore/solve.h"
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "libcore/gpl/xfrmapi.h"
 #include "config.h"
 #include "cookie.h"

=== renamed file 'test/libcore/gpl/checksum.c' => 'test/libcore/checksum.c'
--- test/libcore/gpl/checksum.c	2012-05-12 06:54:33 +0000
+++ test/libcore/checksum.c	2013-06-01 20:15:30 +0000
@@ -33,7 +33,7 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
-#include "libcore/gpl/checksum.h"
+#include "libcore/checksum.h"
 #include "test/libcore/test_suites.h"
 
 inline static void *ipv4_payload(struct ip *const ipv4)
@@ -107,7 +107,7 @@
 
 Suite *libcore_gpl_checksum(void)
 {
-    Suite *s = suite_create("libcore/gpl/checksum");
+    Suite *s = suite_create("libcore/checksum");
 
     TCase *tc_core = tcase_create("Core");
     tcase_add_test(tc_core, test_ipv4_checksum_udp_hip_encap);