diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-04-03 18:00:12 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-04-03 18:01:13 +0200 |
| commit | ef4936538ff9d08f6e73c241043e64b07f37473b (patch) | |
| tree | 8ae8f3c72e25d866e0a5bbbd7ff2c2029b137209 | |
| parent | e4a8182112fe67911ae3c29fa3756203a64be3d5 (diff) | |
| download | gnutls-ef4936538ff9d08f6e73c241043e64b07f37473b.tar.gz | |
Changed license of heartbeat implementation to match the rest of the library
| -rw-r--r-- | lib/ext/heartbeat.c | 6 | ||||
| -rw-r--r-- | m4/hooks.m4 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c index 9ed11400e6..f176202cb8 100644 --- a/lib/ext/heartbeat.c +++ b/lib/ext/heartbeat.c @@ -1,14 +1,14 @@ /* - * Copyright (C) 2012 Free Software Foundation, Inc. + * Copyright (C) 2012,2013 Free Software Foundation, Inc. * Copyright (C) 2013 Nikos Mavrogiannopoulos * - * Author: Olga Smolenchuk, Nikos Mavrogiannopoulos + * Author: Nikos Mavrogiannopoulos * * This file is part of GnuTLS. * * The GnuTLS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of + * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 19d1515501..cadadaa875 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -154,11 +154,11 @@ fi AM_CONDITIONAL(ENABLE_DTLS_SRTP, test "$ac_enable_srtp" != "no") ac_enable_heartbeat=yes - AC_MSG_CHECKING([whether to disable DTLS-SRTP extension]) + AC_MSG_CHECKING([whether to disable TLS heartbeat support]) AC_ARG_ENABLE(heartbeat-support, - AS_HELP_STRING([--enable-heartbeat-support], - [enable support for the heartbeat extension (LGPLv3)]), - ac_enable_heartbeat=$enableval,ac_enable_heartbeat=no) + AS_HELP_STRING([--disable-heartbeat-support], + [disable support for the heartbeat extension]), + ac_enable_heartbeat=$enableval,ac_enable_heartbeat=yes) if test x$ac_enable_heartbeat != xno; then AC_MSG_RESULT(yes) AC_DEFINE([ENABLE_HEARTBEAT], 1, [enable heartbeat support]) |