From 6bec43d415181dd45ca07a0cf3f964cd8ce6e973 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 10:32:53 +0200
Subject: [PATCH 01/10] Move information in COPYING to LICENSE and remove
 COPYING.

Also, rearrange copyright years.

Also also, state NORDUnet as being the provider of the software in the
BSD license.
---
 COPYING |  3 ---
 LICENSE | 16 +++++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 COPYING

diff --git a/COPYING b/COPYING
deleted file mode 100644
index a0b8800..0000000
--- a/COPYING
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
-
-See the LICENSE file for licensing terms.
diff --git a/LICENSE b/LICENSE
index 35c2b98..b4f2f7b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -7,8 +7,9 @@ Public License Version 2 or later (GPL).
 Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.
 
-* Copyright (c) 2006-2010, UNINETT AS
-* Copyright (c) 2010,2011, NORDUnet A/S
+* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+* Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+* Copyright (c) 2010-2012, NORDUnet A/S.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -18,14 +19,15 @@ below BSD style license.
 *     * 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  distribution.
-*     * Neither the name of the UNINETT AS nor the names of its
-*       contributors may be used to endorse or promote products derived
-*       from this software without specific prior written permission.
+*     * Neither the name of NORDUnet A/S 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 UNINETT AS ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``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 UNINETT AS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS 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

From 58e30cdae860e84881d45de63b178801ed69a95e Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 11:07:07 +0200
Subject: [PATCH 02/10] Add copyright and licensing information.

---
 configure.ac | 5 +++++
 gconfig.h    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index 711f9fd..f30694f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,8 @@
+dnl Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+dnl Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+dnl Copyright (c) 2010-2012, NORDUnet A/S.
+dnl See LICENSE for licensing information.
+
 AC_INIT(radsecproxy, 1.6.1-dev, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
diff --git a/gconfig.h b/gconfig.h
index 463ebdf..ae894a6 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,3 +1,8 @@
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
+
 #define CONF_STR 1
 #define CONF_CBK 2
 #define CONF_MSTR 3

From bd942add4b203e9876dc1b8a2f9ae18413a54a20 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 11:11:19 +0200
Subject: [PATCH 03/10] Update copyright and licensing information.

Note that this change makes all files carry the same copyright info,
regardless of when they've been touched. People interested in more
detail will have to consult the commit history.
---
 catgconf.c         | 12 ++++--------
 debug.c            | 12 ++++--------
 debug.h            | 12 ++++--------
 dtls.c             | 11 ++++-------
 dtls.h             | 11 ++++-------
 fticks.c           |  7 ++++---
 fticks.h           |  7 ++++---
 fticks_hashmac.c   |  7 ++++---
 fticks_hashmac.h   |  7 ++++---
 gconfig.c          | 11 ++++-------
 hash.c             | 11 ++++-------
 hash.h             | 11 ++++-------
 hostport.c         | 11 ++++-------
 hostport.h         | 11 ++++-------
 list.c             | 11 ++++-------
 list.h             | 11 ++++-------
 main.c             |  7 ++++---
 radmsg.c           | 11 ++++-------
 radmsg.h           | 11 ++++-------
 radsecproxy-hash.c | 11 ++++-------
 radsecproxy.c      | 12 ++++--------
 radsecproxy.h      | 12 ++++--------
 tcp.c              | 11 ++++-------
 tcp.h              | 11 ++++-------
 tls.c              | 11 ++++-------
 tls.h              | 11 ++++-------
 tlscommon.c        | 12 ++++--------
 tlscommon.h        | 11 ++++-------
 tlv11.c            | 12 ++++--------
 tlv11.h            | 12 ++++--------
 udp.c              | 11 ++++-------
 udp.h              | 11 ++++-------
 util.c             | 11 ++++-------
 util.h             | 11 ++++-------
 34 files changed, 136 insertions(+), 226 deletions(-)

diff --git a/catgconf.c b/catgconf.c
index 42b1d40..59e9e52 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2013, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/debug.c b/debug.c
index 4f6f59e..9e0a4eb 100644
--- a/debug.c
+++ b/debug.c
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/debug.h b/debug.h
index 08c655d..7ed9945 100644
--- a/debug.h
+++ b/debug.h
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/dtls.c b/dtls.c
index bbebfef..24dbe8c 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/dtls.h b/dtls.h
index 3426e63..fd7aae7 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *dtlsinit(uint8_t h);
 
diff --git a/fticks.c b/fticks.c
index 43b37fe..a04f49d 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include "radsecproxy.h"
 #include "debug.h"
diff --git a/fticks.h b/fticks.h
index d302cf0..70a1be9 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 int fticks_configure(struct options *options,
 		     uint8_t **reportingp,
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index bc7b8ba..aeb4c7d 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index 2c031e1..564815d 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/gconfig.c b/gconfig.c
index b7107aa..5d60de7 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2007, 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <string.h>
 #include <stdarg.h>
diff --git a/hash.c b/hash.c
index fd3c04b..9c16def 100644
--- a/hash.c
+++ b/hash.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/hash.h b/hash.h
index 48f54a3..7a2652a 100644
--- a/hash.h
+++ b/hash.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/hostport.c b/hostport.c
index 4214c55..3bcb1c8 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 /* Code contributions from:
  *
diff --git a/hostport.h b/hostport.h
index 207e2ba..d9ea9e4 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 struct hostportres {
     char *host;
diff --git a/list.c b/list.c
index 58ab7aa..26f0fd2 100644
--- a/list.c
+++ b/list.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/list.h b/list.h
index 80c0128..e545191 100644
--- a/list.h
+++ b/list.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/main.c b/main.c
index e2ed409..c2ecf08 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 int radsecproxy_main(int argc, char **argv);
 
diff --git a/radmsg.c b/radmsg.c
index 0a46e71..356e024 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/radmsg.h b/radmsg.h
index 8219a5c..97801b3 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #define RAD_Access_Request 1
 #define RAD_Access_Accept 2
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index 48b3845..24cf236 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2011 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index 8489a18..a92fcd1 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 /* Code contributions from:
  *
diff --git a/radsecproxy.h b/radsecproxy.h
index 1e9dc42..fa16baa 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <sys/time.h>
 #include <stdint.h>
diff --git a/tcp.c b/tcp.c
index 86fa9b6..0e03f52 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/tcp.h b/tcp.h
index c388895..5e3901d 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *tcpinit(uint8_t h);
 
diff --git a/tls.c b/tls.c
index 084c0ce..0330848 100644
--- a/tls.c
+++ b/tls.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/tls.h b/tls.h
index 1a8735e..725e8cd 100644
--- a/tls.h
+++ b/tls.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *tlsinit(uint8_t h);
 
diff --git a/tlscommon.c b/tlscommon.c
index 13a140a..59c2045 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
 #include <signal.h>
diff --git a/tlscommon.h b/tlscommon.h
index 084cb1c..40e2d05 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <openssl/ssl.h>
 
diff --git a/tlv11.c b/tlv11.c
index 94768cf..77db16d 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/tlv11.h b/tlv11.h
index d8bd3c5..9f4a34e 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,11 +1,7 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 struct tlv {
     uint8_t t;
diff --git a/udp.c b/udp.c
index c804703..a6b8bc2 100644
--- a/udp.c
+++ b/udp.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/udp.h b/udp.h
index 8f26e15..11fff53 100644
--- a/udp.h
+++ b/udp.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *udpinit(uint8_t h);
 
diff --git a/util.c b/util.c
index dc36ed9..9aa77bd 100644
--- a/util.c
+++ b/util.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 /* Code contributions from:
  *
diff --git a/util.h b/util.h
index c421505..0cd6621 100644
--- a/util.h
+++ b/util.h
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
 #include <netdb.h>

From e728b33733f3c6db5bbe2f040b251d1e9a70c5c7 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 11:14:56 +0200
Subject: [PATCH 04/10] Add copyright information to LICENSE.

All source files refer to LICENSE. Without copyright information in
the header of that file it might be possible that it changes without
all the copyright holders permission.
---
 LICENSE | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/LICENSE b/LICENSE
index b4f2f7b..e6ef412 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,7 @@
+Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+Copyright (c) 2010-2012, NORDUnet A/S.
+
 The radsecproxy source code is subject to two licenses, you may pick
 the one that best suits your needs.
 

From e64a1e6a4e162c4218efa62e3f8e515019a390c8 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 11:17:24 +0200
Subject: [PATCH 05/10] Add OpenSSL linking exemption to GPL license.

---
 LICENSE | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index e6ef412..42c1c81 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,8 +5,23 @@ Copyright (c) 2010-2012, NORDUnet A/S.
 The radsecproxy source code is subject to two licenses, you may pick
 the one that best suits your needs.
 
+
 The radsecproxy source code is subject to the terms of the GNU General
-Public License Version 2 or later (GPL).
+Public License Version 2 or later (GPL) with the following exemption.
+
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, 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
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+
 
 Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.

From 8d3d567f3b3e0b7f56cce1d878d34768ee86b3c0 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 09:49:39 +0200
Subject: [PATCH 06/10] Remove Stig from first copyright line.

---
 LICENSE            | 4 ++--
 catgconf.c         | 2 +-
 configure.ac       | 2 +-
 debug.c            | 2 +-
 debug.h            | 2 +-
 dtls.c             | 2 +-
 dtls.h             | 2 +-
 fticks.c           | 2 +-
 fticks.h           | 2 +-
 fticks_hashmac.c   | 2 +-
 fticks_hashmac.h   | 2 +-
 gconfig.c          | 2 +-
 gconfig.h          | 2 +-
 hash.c             | 2 +-
 hash.h             | 2 +-
 hostport.c         | 2 +-
 hostport.h         | 2 +-
 list.c             | 2 +-
 list.h             | 2 +-
 main.c             | 2 +-
 radmsg.c           | 2 +-
 radmsg.h           | 2 +-
 radsecproxy-hash.c | 2 +-
 radsecproxy.c      | 2 +-
 radsecproxy.h      | 2 +-
 tcp.c              | 2 +-
 tcp.h              | 2 +-
 tls.c              | 2 +-
 tls.h              | 2 +-
 tlscommon.c        | 2 +-
 tlscommon.h        | 2 +-
 tlv11.c            | 2 +-
 tlv11.h            | 2 +-
 udp.c              | 2 +-
 udp.h              | 2 +-
 util.c             | 2 +-
 util.h             | 2 +-
 37 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/LICENSE b/LICENSE
index 42c1c81..08f8c5e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+Copyright (c) 2006-2010, UNINETT AS.
 Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 Copyright (c) 2010-2012, NORDUnet A/S.
 
@@ -26,7 +26,7 @@ Public License Version 2 or later (GPL) with the following exemption.
 Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.
 
-* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+* Copyright (c) 2006-2010, UNINETT AS.
 * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 * Copyright (c) 2010-2012, NORDUnet A/S.
 * All rights reserved.
diff --git a/catgconf.c b/catgconf.c
index 59e9e52..ec9874a 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2013, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/configure.ac b/configure.ac
index f30694f..544c781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+dnl Copyright (c) 2006-2010, UNINETT AS.
 dnl Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 dnl Copyright (c) 2010-2012, NORDUnet A/S.
 dnl See LICENSE for licensing information.
diff --git a/debug.c b/debug.c
index 9e0a4eb..1a4e6bb 100644
--- a/debug.c
+++ b/debug.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/debug.h b/debug.h
index 7ed9945..aa02ae8 100644
--- a/debug.h
+++ b/debug.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/dtls.c b/dtls.c
index 24dbe8c..959f73f 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/dtls.h b/dtls.h
index fd7aae7..d79511c 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/fticks.c b/fticks.c
index a04f49d..54ec8bf 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/fticks.h b/fticks.h
index 70a1be9..e6e1217 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index aeb4c7d..1ddd212 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index 564815d..c1085af 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/gconfig.c b/gconfig.c
index 5d60de7..8a47f46 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/gconfig.h b/gconfig.h
index ae894a6..cfe04b4 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/hash.c b/hash.c
index 9c16def..0a6e348 100644
--- a/hash.c
+++ b/hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/hash.h b/hash.h
index 7a2652a..d3b0d1f 100644
--- a/hash.h
+++ b/hash.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/hostport.c b/hostport.c
index 3bcb1c8..c31bb17 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/hostport.h b/hostport.h
index d9ea9e4..0093e27 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/list.c b/list.c
index 26f0fd2..00f4029 100644
--- a/list.c
+++ b/list.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/list.h b/list.h
index e545191..4939d06 100644
--- a/list.h
+++ b/list.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/main.c b/main.c
index c2ecf08..c205f92 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/radmsg.c b/radmsg.c
index 356e024..1f374d7 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/radmsg.h b/radmsg.h
index 97801b3..b4baedb 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index 24cf236..cf4e448 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/radsecproxy.c b/radsecproxy.c
index a92fcd1..69e369f 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/radsecproxy.h b/radsecproxy.h
index fa16baa..ade6fe2 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tcp.c b/tcp.c
index 0e03f52..567de25 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tcp.h b/tcp.h
index 5e3901d..67b3ddd 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tls.c b/tls.c
index 0330848..4953e98 100644
--- a/tls.c
+++ b/tls.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tls.h b/tls.h
index 725e8cd..ed571c6 100644
--- a/tls.h
+++ b/tls.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tlscommon.c b/tlscommon.c
index 59c2045..9768d1f 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tlscommon.h b/tlscommon.h
index 40e2d05..98842e1 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tlv11.c b/tlv11.c
index 77db16d..8f98244 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/tlv11.h b/tlv11.h
index 9f4a34e..20ffd6c 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/udp.c b/udp.c
index a6b8bc2..4bc85f1 100644
--- a/udp.c
+++ b/udp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/udp.h b/udp.h
index 11fff53..cf6966e 100644
--- a/udp.h
+++ b/udp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/util.c b/util.c
index 9aa77bd..ce59a96 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
diff --git a/util.h b/util.h
index 0cd6621..97d40e0 100644
--- a/util.h
+++ b/util.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */

From 1c6043308251a2884892cfc726dde45ab115d326 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 09:56:38 +0200
Subject: [PATCH 07/10] Remove the second copyright line, with both UNINETT and
 NORDUnet.

The overlap is clearly expressed without it.
---
 LICENSE            | 2 --
 catgconf.c         | 1 -
 configure.ac       | 1 -
 debug.c            | 1 -
 debug.h            | 1 -
 dtls.c             | 1 -
 dtls.h             | 1 -
 fticks.c           | 1 -
 fticks.h           | 1 -
 fticks_hashmac.c   | 1 -
 fticks_hashmac.h   | 1 -
 gconfig.c          | 1 -
 gconfig.h          | 1 -
 hash.c             | 1 -
 hash.h             | 1 -
 hostport.c         | 1 -
 hostport.h         | 1 -
 list.c             | 1 -
 list.h             | 1 -
 main.c             | 1 -
 radmsg.c           | 1 -
 radmsg.h           | 1 -
 radsecproxy-hash.c | 1 -
 radsecproxy.c      | 1 -
 radsecproxy.h      | 1 -
 tcp.c              | 1 -
 tcp.h              | 1 -
 tls.c              | 1 -
 tls.h              | 1 -
 tlscommon.c        | 1 -
 tlscommon.h        | 1 -
 tlv11.c            | 1 -
 tlv11.h            | 1 -
 udp.c              | 1 -
 udp.h              | 1 -
 util.c             | 1 -
 util.h             | 1 -
 37 files changed, 38 deletions(-)

diff --git a/LICENSE b/LICENSE
index 08f8c5e..a2fdbad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
 Copyright (c) 2006-2010, UNINETT AS.
-Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 Copyright (c) 2010-2012, NORDUnet A/S.
 
 The radsecproxy source code is subject to two licenses, you may pick
@@ -27,7 +26,6 @@ Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.
 
 * Copyright (c) 2006-2010, UNINETT AS.
-* Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 * Copyright (c) 2010-2012, NORDUnet A/S.
 * All rights reserved.
 *
diff --git a/catgconf.c b/catgconf.c
index ec9874a..9cb5380 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2013, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/configure.ac b/configure.ac
index 544c781..97993b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
 dnl Copyright (c) 2006-2010, UNINETT AS.
-dnl Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 dnl Copyright (c) 2010-2012, NORDUnet A/S.
 dnl See LICENSE for licensing information.
 
diff --git a/debug.c b/debug.c
index 1a4e6bb..3121f55 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/debug.h b/debug.h
index aa02ae8..e6f5cfd 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/dtls.c b/dtls.c
index 959f73f..9db68dc 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/dtls.h b/dtls.h
index d79511c..56441e5 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks.c b/fticks.c
index 54ec8bf..d84a2d6 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks.h b/fticks.h
index e6e1217..a2df432 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index 1ddd212..4598a2a 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index c1085af..dda7dd2 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/gconfig.c b/gconfig.c
index 8a47f46..1cd9319 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/gconfig.h b/gconfig.h
index cfe04b4..1ec88fe 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hash.c b/hash.c
index 0a6e348..ced88fc 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hash.h b/hash.h
index d3b0d1f..1be4495 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hostport.c b/hostport.c
index c31bb17..7211ac4 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hostport.h b/hostport.h
index 0093e27..5498524 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/list.c b/list.c
index 00f4029..910ca9e 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/list.h b/list.h
index 4939d06..1c3fde2 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/main.c b/main.c
index c205f92..0a83ae7 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radmsg.c b/radmsg.c
index 1f374d7..124f88c 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radmsg.h b/radmsg.h
index b4baedb..a2a52da 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index cf4e448..1b1d9e7 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy.c b/radsecproxy.c
index 69e369f..1cc477a 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy.h b/radsecproxy.h
index ade6fe2..cc3c333 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tcp.c b/tcp.c
index 567de25..afc130b 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tcp.h b/tcp.h
index 67b3ddd..1517299 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tls.c b/tls.c
index 4953e98..b1ad89c 100644
--- a/tls.c
+++ b/tls.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tls.h b/tls.h
index ed571c6..45f6879 100644
--- a/tls.h
+++ b/tls.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlscommon.c b/tlscommon.c
index 9768d1f..1bdfa1c 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlscommon.h b/tlscommon.h
index 98842e1..1517103 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlv11.c b/tlv11.c
index 8f98244..20e2939 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlv11.h b/tlv11.h
index 20ffd6c..489c01f 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/udp.c b/udp.c
index 4bc85f1..0942c0c 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/udp.h b/udp.h
index cf6966e..80b4f83 100644
--- a/udp.h
+++ b/udp.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/util.c b/util.c
index ce59a96..b5d40c9 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/util.h b/util.h
index 97d40e0..72863d7 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 

From 99cd70118fe023e7b2c19132778383a98b05028b Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 09:59:47 +0200
Subject: [PATCH 08/10] Remove the GPL license.

Also remove the header with two copyright lines. It seems clear what
the copyright of this file is even without these two lines.
---
 LICENSE | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/LICENSE b/LICENSE
index a2fdbad..7a1a5a7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,29 +1,4 @@
-Copyright (c) 2006-2010, UNINETT AS.
-Copyright (c) 2010-2012, NORDUnet A/S.
-
-The radsecproxy source code is subject to two licenses, you may pick
-the one that best suits your needs.
-
-
-The radsecproxy source code is subject to the terms of the GNU General
-Public License Version 2 or later (GPL) with the following exemption.
-
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, 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
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
-
-
-Alternatively the radsecproxy source code is subject to the terms of the
-below BSD style license.
+Radsecproxy is distributed under this license:
 
 * Copyright (c) 2006-2010, UNINETT AS.
 * Copyright (c) 2010-2012, NORDUnet A/S.

From 896ace8fa719b7ee93481bbe6f60bb4988a6879d Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 10:03:46 +0200
Subject: [PATCH 09/10] Remove the "Code contributions from" block from three
 files.

The contributors are mentioned in AUTHORS and these blocks are not
being maintained. Info about what person has written what in source
files should be obtained through the source control management
system (i.e. git).
---
 hostport.c    | 5 -----
 radsecproxy.c | 8 --------
 util.c        | 5 -----
 3 files changed, 18 deletions(-)

diff --git a/hostport.c b/hostport.c
index 7211ac4..c8bdc9f 100644
--- a/hostport.c
+++ b/hostport.c
@@ -2,11 +2,6 @@
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
-/* Code contributions from:
- *
- * Simon Leinen <simon.leinen@switch.ch>
- */
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index 1cc477a..9346a37 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -2,14 +2,6 @@
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
-/* Code contributions from:
- *
- * Arne Schwabe <schwabe at uni-paderborn.de>
- * Maja Wolniewicz <mgw@umk.pl>
- * Simon Leinen <simon.leinen@switch.ch>
- * Stefan Winter <stefan.winter@restena.lu>
- */
-
 /* For UDP there is one server instance consisting of udpserverrd and udpserverth
  *              rd is responsible for init and launching wr
  * For TLS there is a server instance that launches tlsserverrd for each TLS peer
diff --git a/util.c b/util.c
index b5d40c9..fb4217a 100644
--- a/util.c
+++ b/util.c
@@ -2,11 +2,6 @@
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
-/* Code contributions from:
- *
- * Stefan Winter <stefan.winter@restena.lu>
- */
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>

From 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 25 Sep 2012 13:41:08 +0200
Subject: [PATCH 10/10] Formatting changes.

And, actually, a typo in catgconf.c.

Cherry-picked b712a6bf from branch 'licensing'.
Conflicts:

	LICENSE
---
 LICENSE            | 4 ++--
 catgconf.c         | 4 ++--
 configure.ac       | 4 ++--
 debug.c            | 4 ++--
 debug.h            | 4 ++--
 dtls.c             | 4 ++--
 dtls.h             | 4 ++--
 fticks.c           | 4 ++--
 fticks.h           | 4 ++--
 fticks_hashmac.c   | 4 ++--
 fticks_hashmac.h   | 4 ++--
 gconfig.c          | 4 ++--
 gconfig.h          | 4 ++--
 hash.c             | 4 ++--
 hash.h             | 4 ++--
 hostport.c         | 4 ++--
 hostport.h         | 4 ++--
 list.c             | 4 ++--
 list.h             | 4 ++--
 main.c             | 4 ++--
 radmsg.c           | 4 ++--
 radmsg.h           | 4 ++--
 radsecproxy-hash.c | 4 ++--
 radsecproxy.c      | 4 ++--
 radsecproxy.h      | 4 ++--
 tcp.c              | 4 ++--
 tcp.h              | 4 ++--
 tls.c              | 4 ++--
 tls.h              | 4 ++--
 tlscommon.c        | 4 ++--
 tlscommon.h        | 4 ++--
 tlv11.c            | 4 ++--
 tlv11.h            | 4 ++--
 udp.c              | 4 ++--
 udp.h              | 4 ++--
 util.c             | 4 ++--
 util.h             | 4 ++--
 37 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/LICENSE b/LICENSE
index 7a1a5a7..1cdfeac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 Radsecproxy is distributed under this license:
 
-* Copyright (c) 2006-2010, UNINETT AS.
-* Copyright (c) 2010-2012, NORDUnet A/S.
+* Copyright (c) 2006-2010, UNINETT AS
+* Copyright (c) 2010-2012, NORDUnet A/S
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/catgconf.c b/catgconf.c
index 9cb5380..c2be206 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2013, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/configure.ac b/configure.ac
index 97993b3..4326ecc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-dnl Copyright (c) 2006-2010, UNINETT AS.
-dnl Copyright (c) 2010-2012, NORDUnet A/S.
+dnl Copyright (c) 2006-2010, UNINETT AS
+dnl Copyright (c) 2010-2012, NORDUnet A/S
 dnl See LICENSE for licensing information.
 
 AC_INIT(radsecproxy, 1.6.1-dev, radsecproxy@uninett.no)
diff --git a/debug.c b/debug.c
index 3121f55..a9e4b36 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/debug.h b/debug.h
index e6f5cfd..b892b96 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/dtls.c b/dtls.c
index 9db68dc..9e769fc 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/dtls.h b/dtls.h
index 56441e5..27183db 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *dtlsinit(uint8_t h);
diff --git a/fticks.c b/fticks.c
index d84a2d6..4d4d2eb 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include "radsecproxy.h"
diff --git a/fticks.h b/fticks.h
index a2df432..dfc209f 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 int fticks_configure(struct options *options,
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index 4598a2a..c8ad0dc 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index dda7dd2..9e06956 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdint.h>
diff --git a/gconfig.c b/gconfig.c
index 1cd9319..e58959b 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <string.h>
diff --git a/gconfig.h b/gconfig.h
index 1ec88fe..2cdda4f 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #define CONF_STR 1
diff --git a/hash.c b/hash.c
index ced88fc..51f039f 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hash.h b/hash.h
index 1be4495..3c359e9 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/hostport.c b/hostport.c
index c8bdc9f..27b5b9f 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hostport.h b/hostport.h
index 5498524..21b1979 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct hostportres {
diff --git a/list.c b/list.c
index 910ca9e..971daaf 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/list.h b/list.h
index 1c3fde2..cf63dce 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/main.c b/main.c
index 0a83ae7..9787d1e 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 int radsecproxy_main(int argc, char **argv);
diff --git a/radmsg.c b/radmsg.c
index 124f88c..258c9f9 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/radmsg.h b/radmsg.h
index a2a52da..cd83609 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #define RAD_Access_Request 1
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index 1b1d9e7..c9e2a7f 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index 9346a37..d10d7a8 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 /* For UDP there is one server instance consisting of udpserverrd and udpserverth
diff --git a/radsecproxy.h b/radsecproxy.h
index cc3c333..6542e99 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/time.h>
diff --git a/tcp.c b/tcp.c
index afc130b..f5dc274 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tcp.h b/tcp.h
index 1517299..239e4a0 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *tcpinit(uint8_t h);
diff --git a/tls.c b/tls.c
index b1ad89c..599e2a7 100644
--- a/tls.c
+++ b/tls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tls.h b/tls.h
index 45f6879..464fcae 100644
--- a/tls.h
+++ b/tls.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *tlsinit(uint8_t h);
diff --git a/tlscommon.c b/tlscommon.c
index 1bdfa1c..109cef0 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
diff --git a/tlscommon.h b/tlscommon.h
index 1517103..9e2ba02 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <openssl/ssl.h>
diff --git a/tlv11.c b/tlv11.c
index 20e2939..8197e90 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/tlv11.h b/tlv11.h
index 489c01f..e5c653e 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct tlv {
diff --git a/udp.c b/udp.c
index 0942c0c..352b2f9 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/udp.h b/udp.h
index 80b4f83..7e5f038 100644
--- a/udp.h
+++ b/udp.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *udpinit(uint8_t h);
diff --git a/util.c b/util.c
index fb4217a..520abad 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
diff --git a/util.h b/util.h
index 72863d7..eb5c27c 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>