summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/cha-library.texi8
-rw-r--r--doc/cha-support.texi13
-rw-r--r--lib/gnutls_errors.c2
-rw-r--r--lib/gnutls_srp.c4
4 files changed, 6 insertions, 21 deletions
diff --git a/doc/cha-library.texi b/doc/cha-library.texi
index 44b41ae149..1b75722e04 100644
--- a/doc/cha-library.texi
+++ b/doc/cha-library.texi
@@ -40,7 +40,7 @@ implementation, and is entirely implemented within the
@acronym{GnuTLS} library. The `Certificate part' consists of the
certificate parsing, and verification functions which is partially
implemented in the @acronym{GnuTLS} library. The
-libtasn1@footnote{@url{ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/}},
+libtasn1@footnote{@url{http://www.gnu.org/software/libtasn1/}},
a library which offers @acronym{ASN.1} parsing capabilities, is used
for the @acronym{X.509} certificate parsing functions.
The ``Cryptographic back-end'' is provided by nettle@footnote{@url{http://www.lysator.liu.se/~nisse/nettle/}}
@@ -142,12 +142,6 @@ behavior the @funcref{gnutls_global_set_mem_functions} function is
available which can be used to set other memory handlers than the
defaults.
-The @acronym{Libgcrypt} library on which @acronym{GnuTLS} depends, has
-such secure memory allocation functions available. These should be
-used in cases where even the system's swap memory is not considered
-secure. See the documentation of @acronym{Libgcrypt} for more
-information.
-
@node Thread safety
@section Thread safety
diff --git a/doc/cha-support.texi b/doc/cha-support.texi
index 273c30e990..604f85fce5 100644
--- a/doc/cha-support.texi
+++ b/doc/cha-support.texi
@@ -72,14 +72,9 @@ development release. For example, GnuTLS 1.6.3 denote a stable
release since 6 is even, and GnuTLS 1.7.11 denote a development
release since 7 is odd.
-GnuTLS depends on Libgcrypt,
-and you will need to install Libgcrypt
-before installing GnuTLS. Libgcrypt is available from
-@url{ftp://ftp.gnupg.org/gcrypt/libgcrypt}. Libgcrypt needs another
-library, libgpg-error, and you need to install libgpg-error before
-installing Libgcrypt. Libgpg-error is available from
-@url{ftp://ftp.gnupg.org/gcrypt/libgpg-error}.
-
+GnuTLS depends on Libnettle, and you will need to install it
+before installing GnuTLS. Libnettle is available from
+@url{http://www.lysator.liu.se/~nisse/nettle/}.
Don't forget to verify the cryptographic signature after downloading
source code packages.
@@ -98,8 +93,6 @@ called libtasn1. A copy of libtasn1 is included in GnuTLS. If you
want to install it separately (e.g., to make it possibly to use
libtasn1 in other programs), you can get it from
@url{http://www.gnu.org/software/gnutls/download.html}.
-The OpenPGP part of GnuTLS uses a stripped down version of OpenCDK for
-parsing OpenPGP packets.
A few @code{configure} options may be relevant, summarized below.
They disable or enable particular features.
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index a56a18f3a0..fa706092b1 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -209,7 +209,7 @@ static const gnutls_error_entry error_algorithms[] = {
ERROR_ENTRY (N_
("The GnuTLS library version does not match the GnuTLS-extra library version."),
GNUTLS_E_LIBRARY_VERSION_MISMATCH, 1),
- ERROR_ENTRY (N_("The gcrypt library version is too old."),
+ ERROR_ENTRY (N_("The crypto library version is too old."),
GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY, 1),
ERROR_ENTRY (N_("The tasn1 library version is too old."),
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index bbfd793a4b..95c2c82df2 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -674,9 +674,7 @@ gnutls_srp_server_get_username (gnutls_session_t session)
*
* This function will create an SRP verifier, as specified in
* RFC2945. The @prime and @generator should be one of the static
- * parameters defined in gnutls/extra.h or may be generated using the
- * libgcrypt functions gcry_prime_generate() and
- * gcry_prime_group_generator().
+ * parameters defined in gnutls/extra.h or may be generated.
*
* The verifier will be allocated with @gnutls_malloc() and will be stored in
* @res using binary format.