diff options
author | Christian Pointner <equinox@anytun.org> | 2014-06-29 15:53:21 +0000 |
---|---|---|
committer | Christian Pointner <equinox@anytun.org> | 2014-06-29 15:53:21 +0000 |
commit | d201613b477106ba85e32845542d5f73163fe5d5 (patch) | |
tree | a857f49c89fa2018d91146b5cf239e2b32017aa8 /src/uanytun.c | |
parent | merged changelog from trunk (diff) |
merged trunk changes to rail branch
Diffstat (limited to 'src/uanytun.c')
-rw-r--r-- | src/uanytun.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/uanytun.c b/src/uanytun.c index 3453a38..93ddf63 100644 --- a/src/uanytun.c +++ b/src/uanytun.c @@ -10,7 +10,7 @@ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel * mode and allows tunneling of every ETHER TYPE protocol (e.g. * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is + * message authentication based on the methods used by SRTP. It is * intended to deliver a generic, scaleable and secure solution for * tunneling and relaying of packets of any protocol. * @@ -31,6 +31,19 @@ * * You should have received a copy of the GNU General Public License * along with uAnytun. If not, see <http://www.gnu.org/licenses/>. + * + * 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. */ #include "datatypes.h" |