Formatting changes.

[libradsec.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 18e2d6f..d044178 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,32 @@
+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).
+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.
 
-* Copyright (c) 2006-2008, UNINETT AS
+* 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
@@ -17,14 +36,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