ソースを参照

tls: clarified licensing based on development history

- some were c&p as they refered to files related to components that were
  developed later than the (c) year (e.g., selects)
- added openssl exception to gpl parts based on agreement from the
  developers of those components - most of the code was released long time
  ago under BSD by iptelorg. Code was rewrote for 3.1 when asynchronous
  support was developed.
Daniel-Constantin Mierla 11 年 前
コミット
7771e9cdb5

+ 23 - 16
modules/tls/README

@@ -63,7 +63,10 @@ Andrei Pelinescu-Onciul
               11.3. tls.options
               11.4. tls.reload
 
-        12. History
+        12. Status
+
+              12.1. License
+              12.2. History
 
    List of Examples
 
@@ -166,7 +169,10 @@ Chapter 1. Admin Guide
         11.3. tls.options
         11.4. tls.reload
 
-   12. History
+   12. Status
+
+        12.1. License
+        12.2. History
 
 1. Overview
 
@@ -486,10 +492,10 @@ Revoking a certificate and using a CRL
 9.1. tls_method (string)
 
    Sets the SSL/TLS protocol method. Possible values are:
-     * TLSv1.1 - only TLSv1.2 connections are accepted (available starting
+     * TLSv1.2 - only TLSv1.2 connections are accepted (available starting
        with openssl/libssl v1.0.1e)
      * TLSv1.1 - only TLSv1.1 connections are accepted (available starting
-       with openssl/libssl v1.0.0)
+       with openssl/libssl v1.0.1)
      * TLSv1 - only TLSv1 connections are accepted. This is the default
        value.
      * SSLv3 - only SSLv3 connections are accepted
@@ -1204,20 +1210,21 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg")
    Parameters:
      * None.
 
-12. History
+12. Status
+
+   12.1. License
+   12.2. History
+
+12.1. License
+
+   Most of the code for this module has been released under BSD by
+   iptelorg. The GPL parts are released with an exception to link with
+   OpenSSL toolkit software components.
 
-   This module was put together by Jan Janak <[email protected]> from code
-   based on the experimental tls core addon
-   (http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/experimental/tls/), code
-   originally written by Peter Griffiths and later maintained by Cesc
-   Santasusana and from an iptelorg tls code addon, written by Andrei
-   Pelinescu-Onciul <[email protected]>. Jan also added support for
-   multiple domains, a tls specific config, config reloading and a tls
-   specific select framework.
+12.2. History
 
-   For Kamailio 3.1 most of the TLS specific code was completely
-   re-written to add support for asynchronous TLS and fix several long
-   standing bugs.
+   For version 3.1 most of the TLS specific code was completely re-written
+   to add support for asynchronous TLS and fix several long standing bugs.
 
    The code is currently maintained by Andrei Pelinescu-Onciul
    <[email protected]>.

+ 14 - 13
modules/tls/doc/history.xml

@@ -8,25 +8,26 @@
 
 ]>
 
-<section id="tls.history">
-    <sectioninfo>
-    </sectioninfo>
-
-	<title>History</title>
+<section id="tls.status">
+	<title>Status</title>
+	<section id="tls.license">
+	<title>License</title>
 		<para>
-			This module was put together by Jan Janak <email>[email protected]</email> from code 
-			based on the experimental tls core addon (<ulink url="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/experimental/tls/">http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/experimental/tls/</ulink>), 
-			code originally written by Peter Griffiths and later maintained by Cesc Santasusana and 
-			from an iptelorg tls code addon, written by Andrei Pelinescu-Onciul <email>[email protected]</email>.
-			Jan also added support for multiple domains, a tls specific config, config reloading and a 
-			tls specific select framework.
+			Most of the code for this module has been released under BSD by
+			iptelorg. The GPL parts are released with an exception to link
+			with OpenSSL toolkit software components.
 		</para>
+	</section>
+	<section id="tls.history">
+	<title>History</title>
 		<para>
-			For &kamailio; 3.1 most of the TLS specific code was completely
+			For version 3.1 most of the TLS specific code was completely
 			re-written to add support for asynchronous TLS and fix several
 			long standing bugs.
 		</para>
 		<para>
-			The code is currently maintained by Andrei Pelinescu-Onciul <email>[email protected]</email>.
+			The code is currently maintained by Andrei Pelinescu-Onciul
+			<email>[email protected]</email>.
 		</para>
+	</section>
 </section>

+ 2 - 1
modules/tls/fixed_c_zlib.h

@@ -1,4 +1,5 @@
-/* $Id$
+/*
+ * TLS module
  * 
  * This file contains modified zlib compression functions
  * originally part of crypto/comp/c_zlib.c from the openssl library 

+ 2 - 2
modules/tls/sbufq.h

@@ -1,6 +1,6 @@
 /* 
- * $Id$
- * 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 0
modules/tls/tls_bio.c

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 0
modules/tls/tls_bio.h

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 0
modules/tls/tls_cfg.c

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 1 - 1
modules/tls/tls_cfg.h

@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * TLS module
  * 
  * Copyright (C) 2010 iptelorg GmbH
  *

+ 12 - 21
modules/tls/tls_config.c

@@ -1,28 +1,19 @@
 /*
- * $Id$
+ * TLS module
  *
- * TLS module - Configuration file parser
+ * Copyright (C) 2010 iptelorg GmbH
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
- * Copyright (C) 2005,2006 iptelorg GmbH
- *
- * This file is part of SIP-router, a free SIP server.
- *
- * SIP-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * SIP-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*!
  * \file

+ 13 - 27
modules/tls/tls_config.h

@@ -1,33 +1,19 @@
-/*
- * $Id$
- *
- * TLS module - Configuration file parser
+/* 
+ * TLS module
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005,2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
- *
- * ser is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the ser software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*!
  * \file

+ 2 - 0
modules/tls/tls_ct_q.h

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 0
modules/tls/tls_ct_wrq.c

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 0
modules/tls/tls_ct_wrq.h

@@ -1,4 +1,6 @@
 /* 
+ * TLS module
+ *
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 1
modules/tls/tls_domain.c

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2001-2003 FhG FOKUS
+ * TLS module
+ *
  * Copyright (C) 2005,2006 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 2 - 1
modules/tls/tls_domain.h

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2001-2003 FhG FOKUS
+ * TLS module
+ *
  * Copyright (C) 2005,2006 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

+ 6 - 1
modules/tls/tls_dump_vf.c

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * TLS module
  *
  * Copyright (C) 2006 enum.at
  *
@@ -18,6 +18,11 @@
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Exception: permission to copy, modify, propagate, and distribute a work
+ * formed by combining OpenSSL toolkit software and the code in this file,
+ * such as linking with software components and libraries released under
+ * OpenSSL project license.
  */
 /** log the verification failure reason.
  * @file tls_dump_vf.c

+ 6 - 1
modules/tls/tls_dump_vf.h

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * TLS module
  *
  * Copyright (C) 2006 enum.at
  *
@@ -18,6 +18,11 @@
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Exception: permission to copy, modify, propagate, and distribute a work
+ * formed by combining OpenSSL toolkit software and the code in this file,
+ * such as linking with software components and libraries released under
+ * OpenSSL project license.
  */
 /** log the verification failure reason.
  * @file tls_dump_vf.h

+ 12 - 26
modules/tls/tls_init.c

@@ -1,33 +1,19 @@
-/*
- * $Id$
- *
- * TLS module - OpenSSL initialization funtions
+/* 
+ * TLS module
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005,2006 iptelorg GmbH
  *
- * This file is part of SIP-router, a free SIP server.
- *
- * SIP-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
+ * 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.
  *
- * SIP-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-/*
- * History:
- * --------
- *  2007-01-26  openssl kerberos malloc bug detection/workaround (andrei)
- *  2007-02-23  openssl low memory bugs workaround (andrei)
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 /*! \defgroup tls SIP-router TLS support

+ 12 - 25
modules/tls/tls_init.h

@@ -1,32 +1,19 @@
-/*
- * $Id$
- * 
- * TLS module - OpenSSL initialization funtions
+/* 
+ * TLS module
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005,2006 iptelorg GmbH
  *
- * This file is part of ser, a free SIP server.
- *
- * ser is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the ser software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*!
  * \file

+ 2 - 8
modules/tls/tls_locking.c

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * TLS module
  *
  * Copyright (C) 2007 iptelorg GmbH 
  *
@@ -15,13 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * tls locking and atomic ops related init functions
- *
- * History:
- * --------
- *  2007-01-22  created by andrei
- */
+
 /*!
  * \file
  * \brief SIP-router TLS support :: Locking

+ 1 - 1
modules/tls/tls_locking.h

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * TLS module
  *
  * Copyright (C) 2007 iptelorg GmbH 
  *

+ 13 - 35
modules/tls/tls_mod.c

@@ -1,43 +1,21 @@
 /*
- * $Id$
+ * TLS module
  *
- * TLS module - module interface
+ * Copyright (C) 2007 iptelorg GmbH 
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
- * Copyright (C) 2005,2006 iptelorg GmbH
+ * 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.
  *
- * This file is part of SIP-router, a free SIP server.
- *
- * SIP-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * SIP-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * History:
- * -------
- * 2003-03-11: New module interface (janakj)
- * 2003-03-16: flags export parameter added (janakj)
- * 2003-04-05: default_uri #define used (jiri)
- * 2003-04-06: db connection closed in mod_init (janakj)
- * 2004-06-06  updated to the new DB api, cleanup: static dbf & handler,
- *              calls to domain_db_{bind,init,close,ver} (andrei)
- * 2007-02-09  updated to the new tls_hooks api and renamed tls hooks hanlder
- *              functions to avoid conflicts: s/tls_/tls_h_/   (andrei)
- * 2010-03-19  new parameters to control advanced openssl lib options
- *              (mostly work on 1.0.0+): ssl_release_buffers, ssl_read_ahead,
- *              ssl_freelist_max_len, ssl_max_send_fragment   (andrei)
- * 2010-05-27  migrated to the runtime cfg framework (andrei)
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
 /** SIP-router TLS support :: Module interface.
  * @file
  * @ingroup tls

+ 11 - 24
modules/tls/tls_mod.h

@@ -1,32 +1,19 @@
-/*
- * $Id$
- *
+/* 
  * TLS module - module interface
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005 iptelorg GmbH
  *
- * This file is part of sip-router, a free SIP server.
- *
- * sip-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the sip-router software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * sip-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /** SIP-router TLS support :: module interface.
  * @file

+ 0 - 3
modules/tls/tls_rpc.c

@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * TLS module - management interface
  *
- * Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2005 iptelorg GmbH
  *
  * This file is part of sip-router, a free SIP server.

+ 1 - 4
modules/tls/tls_rpc.h

@@ -1,9 +1,6 @@
 /*
- * $Id$
+ * TLS module
  *
- * TLS module - management interface
- *
- * Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2005 iptelorg GmbH
  *
  * This file is part of sip-router, a free SIP server.

+ 5 - 4
modules/tls/tls_select.c

@@ -1,10 +1,6 @@
 /*
- * $Id$
- *
  * TLS module - select interface
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005 iptelorg GmbH
  * Copyright (C) 2006 enum.at
  *
@@ -23,6 +19,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Exception: permission to copy, modify, propagate, and distribute a work
+ * formed by combining OpenSSL toolkit software and the code in this file,
+ * such as linking with software components and libraries released under
+ * OpenSSL project license.
  */
 /** SIP-router TLS support :: Select interface.
  * @file

+ 5 - 4
modules/tls/tls_select.h

@@ -1,10 +1,6 @@
 /*
- * $Id$
- *
  * TLS module - select interface
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005,2006 iptelorg GmbH
  * Copyright (C) 2006 enum.at
  *
@@ -28,6 +24,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Exception: permission to copy, modify, propagate, and distribute a work
+ * formed by combining OpenSSL toolkit software and the code in this file,
+ * such as linking with software components and libraries released under
+ * OpenSSL project license.
  */
 /*!
  * \file

+ 1 - 4
modules/tls/tls_server.c

@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * TLS module - main server part
- * 
- * Copyright (C) 2001-2003 FhG FOKUS
+ *
  * Copyright (C) 2005-2010 iptelorg GmbH
  *
  * This file is part of SIP-router, a free SIP server.

+ 0 - 3
modules/tls/tls_server.h

@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * TLS module - main server part
  * 
- * Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2005-2010 iptelorg GmbH
  *
  * This file is part of SIP-router, a free SIP server.

+ 12 - 20
modules/tls/tls_util.c

@@ -1,27 +1,19 @@
-/*
- * $Id$
- *
- * TLS module - common functions
+/* 
+ * TLS module
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
  * Copyright (C) 2005 iptelorg GmbH
  *
- * This file is part of SIP-router, a free SIP server.
- *
- * SIP-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * SIP-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #define _GNU_SOURCE 1 /* Needed for strndup */

+ 13 - 26
modules/tls/tls_util.h

@@ -1,32 +1,19 @@
-/*
- * $Id$
- *
- * TLS module - common functions
- *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
- * COpyright (C) 2005 iptelorg GmbH
- *
- * This file is part of sip-router, a free SIP server.
- *
- * sip-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
+/* 
+ * TLS module
  *
- * For a license to use the sip-router software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
+ * Copyright (C) 2010 iptelorg GmbH
  *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*!
  * \file

+ 13 - 21
modules/tls/tls_verify.c

@@ -1,27 +1,19 @@
-/*
- * $Id$
+/* 
+ * TLS module
  *
- * TLS module - certificate verification function
+ * Copyright (C) 2005 iptelorg GmbH
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
- * COpyright (C) 2005 iptelorg GmbH
+ * 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.
  *
- * This file is part of sip-router, a free SIP server.
- *
- * sip-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * sip-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "../../dprint.h"

+ 12 - 25
modules/tls/tls_verify.h

@@ -1,32 +1,19 @@
-/*
- * $Id$
- *
+/* 
  * TLS module - certificate verification function
  *
- * Copyright (C) 2001-2003 FhG FOKUS
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
- * COpyright (C) 2005 iptelorg GmbH
- *
- * This file is part of SIP-router, a free SIP server.
- *
- * SIP-router is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the SIP-router software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
+ * Copyright (C) 2005 iptelorg GmbH
  *
- * SIP-router is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*!
  * \file