Support for TPM modules via trousers is now enabled by default.

diff --git a/NEWS b/NEWS
index a21c9cdbc731450c026aa171c677014415d51baf..8ff25ee5c014811b08730ac80b4ec2d603ceaa0e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ See the end for copying conditions.
 
 * Version 3.2.6 (unreleased)
 
+** libgnutls: Support for TPM via trousers is now enabled by default.
+
 ** libgnutls: Camellia in GCM mode has been added in default priorities.
 
 ** libgnutls: Added ciphersuite GNUTLS_ECDHE_RSA_AES_256_CBC_SHA384.

diff --git a/configure.ac b/configure.ac
index d207c362955e20d668759850a11ac51e7586689f..d13f4757a012def95a1a4412672b4d359b0b4151 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -302,9 +302,9 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 AC_ARG_WITH(tpm,
-       AS_HELP_STRING([--with-tpm],
-               [Build with TPM (trousers) support. Note that trousers is under the Common Public License and incompatible with GPL programs.]),
-               [with_tpm=$withval], [with_tpm=no])
+       AS_HELP_STRING([--without-tpm],
+               [Disable TPM (trousers) support.]),
+               [with_tpm=$withval], [with_tpm=yes])
 if test "$with_tpm" != "no"; then
     LIBS="$oldlibs -ltspi"
     AC_MSG_CHECKING([for tss library])

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index f88a767daccc2532305d92c930a63847a54ebc5e..8287ff2cc82ef66d6e08f8245e6b5eef33c6f662 100644 (file)
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -368,12 +368,7 @@ certificates by specifying a PKCS #11 URL instead of a filename.
 @cindex TPM
 
 In this section we present the Trusted Platform Module (TPM) support 
-in @acronym{GnuTLS}. Note that this functionality is disabled by default
-because the @code{trousers} libraries GnuTLS depends on
-are under the Common Public License which is not compatible with the GPL 
-license. By disabling this feature by default we ensure that the GnuTLS library can
-be linked by both GPL and non-GPL programs, but you can enable this option
-during the library configuration.
+in @acronym{GnuTLS}. 
 
 There was a big hype when the TPM chip was introduced into 
 computers. Briefly it is a co-processor in your PC that allows it to perform