diff options
| -rw-r--r-- | COPYING | 3 | ||||
| -rw-r--r-- | LICENSE | 22 | ||||
| -rw-r--r-- | catgconf.c | 11 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debug.c | 11 | ||||
| -rw-r--r-- | debug.h | 11 | ||||
| -rw-r--r-- | dtls.c | 10 | ||||
| -rw-r--r-- | dtls.h | 10 | ||||
| -rw-r--r-- | fticks.c | 6 | ||||
| -rw-r--r-- | fticks.h | 6 | ||||
| -rw-r--r-- | fticks_hashmac.c | 6 | ||||
| -rw-r--r-- | fticks_hashmac.h | 6 | ||||
| -rw-r--r-- | gconfig.c | 10 | ||||
| -rw-r--r-- | gconfig.h | 4 | ||||
| -rw-r--r-- | hash.c | 10 | ||||
| -rw-r--r-- | hash.h | 10 | ||||
| -rw-r--r-- | hostport.c | 15 | ||||
| -rw-r--r-- | hostport.h | 10 | ||||
| -rw-r--r-- | list.c | 10 | ||||
| -rw-r--r-- | list.h | 10 | ||||
| -rw-r--r-- | main.c | 6 | ||||
| -rw-r--r-- | radmsg.c | 10 | ||||
| -rw-r--r-- | radmsg.h | 10 | ||||
| -rw-r--r-- | radsecproxy-hash.c | 10 | ||||
| -rw-r--r-- | radsecproxy.c | 19 | ||||
| -rw-r--r-- | radsecproxy.h | 11 | ||||
| -rw-r--r-- | tcp.c | 10 | ||||
| -rw-r--r-- | tcp.h | 10 | ||||
| -rw-r--r-- | tls.c | 10 | ||||
| -rw-r--r-- | tls.h | 10 | ||||
| -rw-r--r-- | tlscommon.c | 11 | ||||
| -rw-r--r-- | tlscommon.h | 10 | ||||
| -rw-r--r-- | tlv11.c | 11 | ||||
| -rw-r--r-- | tlv11.h | 11 | ||||
| -rw-r--r-- | udp.c | 10 | ||||
| -rw-r--r-- | udp.h | 10 | ||||
| -rw-r--r-- | util.c | 15 | ||||
| -rw-r--r-- | util.h | 10 |
38 files changed, 118 insertions, 261 deletions
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. @@ -1,14 +1,7 @@ -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). - -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,2011, 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 +11,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 @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <stdio.h> #include <string.h> diff --git a/configure.ac b/configure.ac index 9ba93f5..e5df020 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,7 @@ +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.7-dev, radsecproxy@uninett.no) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifndef SYS_SOLARIS9 #include <stdint.h> @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifndef SYS_SOLARIS9 #include <stdint.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <signal.h> #include <sys/socket.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ const struct protodefs *dtlsinit(uint8_t h); @@ -1,6 +1,6 @@ -/* Copyright (C) 2011 NORDUnet A/S - * See LICENSE for information about licensing. - */ +/* Copyright (c) 2006-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include "radsecproxy.h" #include "debug.h" @@ -1,6 +1,6 @@ -/* Copyright (C) 2011 NORDUnet A/S - * See LICENSE for information about licensing. - */ +/* Copyright (c) 2006-2010, UNINETT AS + * 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..c8ad0dc 100644 --- a/fticks_hashmac.c +++ b/fticks_hashmac.c @@ -1,6 +1,6 @@ -/* Copyright (C) 2011 NORDUnet A/S - * See LICENSE for information about licensing. - */ +/* Copyright (c) 2006-2010, UNINETT AS + * 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..9e06956 100644 --- a/fticks_hashmac.h +++ b/fticks_hashmac.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2011 NORDUnet A/S - * See LICENSE for information about licensing. - */ +/* Copyright (c) 2006-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <stdint.h> #include <stddef.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <string.h> #include <stdarg.h> @@ -1,3 +1,7 @@ +/* Copyright (c) 2006-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ + #define CONF_STR 1 #define CONF_CBK 2 #define CONF_MSTR 3 @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <stdlib.h> #include <string.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifndef SYS_SOLARIS9 #include <stdint.h> @@ -1,15 +1,6 @@ -/* - * 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. - */ - -/* Code contributions from: - * - * Simon Leinen <simon.leinen@switch.ch> - */ +/* Copyright (c) 2006-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <stdlib.h> #include <unistd.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ struct hostportres { char *host; @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <stdlib.h> #include <string.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifdef SYS_SOLARIS9 #include <sys/inttypes.h> @@ -1,6 +1,6 @@ -/* Copyright (C) 2011 NORDUnet A/S - * See LICENSE for information about licensing. - */ +/* 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); @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifdef SYS_SOLARIS9 #include <sys/inttypes.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * 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..c9e2a7f 100644 --- a/radsecproxy-hash.c +++ b/radsecproxy-hash.c @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * 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..d10d7a8 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -1,19 +1,6 @@ -/* - * 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. - */ - -/* 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> - */ +/* 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 * rd is responsible for init and launching wr diff --git a/radsecproxy.h b/radsecproxy.h index 1e9dc42..6542e99 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <sys/time.h> #include <stdint.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <signal.h> #include <sys/socket.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ const struct protodefs *tcpinit(uint8_t h); @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <signal.h> #include <sys/socket.h> @@ -1,10 +1,6 @@ -/* - * 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-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 13a140a..109cef0 100644 --- a/tlscommon.c +++ b/tlscommon.c @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * 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..9e2ba02 100644 --- a/tlscommon.h +++ b/tlscommon.h @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <openssl/ssl.h> @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifdef SYS_SOLARIS9 #include <sys/inttypes.h> @@ -1,11 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ struct tlv { uint8_t t; @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <signal.h> #include <sys/socket.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ const struct protodefs *udpinit(uint8_t h); @@ -1,15 +1,6 @@ -/* - * 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. - */ - -/* Code contributions from: - * - * Stefan Winter <stefan.winter@restena.lu> - */ +/* Copyright (c) 2006-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <sys/socket.h> #include <netinet/in.h> @@ -1,10 +1,6 @@ -/* - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #include <sys/socket.h> #include <netdb.h> |