From 4df1edb70331dad8efc511c68a2aec09e38b0887 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 26 Oct 2013 15:08:46 +0200 Subject: Support for TPM modules via trousers is now enabled by default. --- NEWS | 6 ++++-- configure.ac | 6 +++--- doc/cha-tokens.texi | 4 +--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index c51e51f63b..564f2222ff 100644 --- a/NEWS +++ b/NEWS @@ -4,11 +4,13 @@ See the end for copying conditions. * Version 3.1.17 (unreleased) -** certtool: When exporting an encrypted PEM private key do not output the key -parameters. +** libgnutls: Support for TPM via trousers is now enabled by default. ** libgnutls: Added support for ISO OID for RSA-SHA1 signatures. +** certtool: When exporting an encrypted PEM private key do not output the key +parameters. + ** API and ABI modifications: No changes since last version. diff --git a/configure.ac b/configure.ac index d9ca96fea2..c288a74c2b 100644 --- a/configure.ac +++ b/configure.ac @@ -279,9 +279,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 09be6e5d20..6252d8d4c1 100644 --- a/doc/cha-tokens.texi +++ b/doc/cha-tokens.texi @@ -368,9 +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 for that functionality -are under the Common Public License which is not compatible with the GPL license. +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 -- cgit v1.2.1