From 42bfef1e908fe60f8a7a86e66616b51702f1c0fb Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Sun, 1 Sep 2013 15:24:04 -0700 Subject: [PATCH 1/1] GnuTLS website moves --- doc/doc-docbook/spec.xfpt | 6 +++--- doc/doc-txt/GnuTLS-FAQ.txt | 2 +- doc/doc-txt/NewStuff | 2 +- src/README.UPDATING | 2 +- src/src/tls-gnu.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 29214e3e1..ae6e33efe 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -13986,7 +13986,7 @@ This option will let GnuTLS (2.12.0 or later) autoload PKCS11 modules with the p11-kit configuration files in &_/etc/pkcs11/modules/_&. See -&url(http://www.gnu.org/software/gnutls/manual/gnutls.html#Smart-cards-and-HSMs) +&url(http://www.gnutls.org/manual/gnutls.html#Smart-cards-and-HSMs) for documentation. .wen @@ -25597,10 +25597,10 @@ aware of future feature enhancements of GnuTLS. Documentation of the strings accepted may be found in the GnuTLS manual, under "Priority strings". This is online as -&url(http://www.gnu.org/software/gnutls/manual/html_node/Priority-Strings.html), +&url(http://www.gnutls.org/manual/html_node/Priority-Strings.html), but beware that this relates to GnuTLS 3, which may be newer than the version installed on your system. If you are using GnuTLS 3, -&url(http://www.gnu.org/software/gnutls/manual/html_node/Listing-the-ciphersuites-in-a-priority-string.html, then the example code) +&url(http://www.gnutls.org/manual/gnutls.html#Listing-the-ciphersuites-in-a-priority-string, then the example code) on that site can be used to test a given string. Prior to Exim 4.80, an older API of GnuTLS was used, and Exim supported three diff --git a/doc/doc-txt/GnuTLS-FAQ.txt b/doc/doc-txt/GnuTLS-FAQ.txt index 766e27927..897087582 100644 --- a/doc/doc-txt/GnuTLS-FAQ.txt +++ b/doc/doc-txt/GnuTLS-FAQ.txt @@ -300,7 +300,7 @@ NORMAL.) See Q8. The current documentation, for the most recent release of GnuTLS, is available online at: - http://www.gnu.org/software/gnutls/manual/html_node/Priority-Strings.html + http://www.gnutls.org/manual/html_node/Priority-Strings.html Beware that if you are not using the most recent GnuTLS release then this documentation will be wrong for you! You should find the "info" documentation diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index d1d0d7279..65694201d 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -208,7 +208,7 @@ Version 4.80 gnutls_require_mac & gnutls_require_protocols are no longer supported. tls_require_ciphers is now parsed by gnutls_priority_init(3) as a priority string, documentation for which is at: - http://www.gnu.org/software/gnutls/manual/html_node/Priority-Strings.html + http://www.gnutls.org/manual/html_node/Priority-Strings.html SNI support has been added to Exim's GnuTLS integration too. diff --git a/src/README.UPDATING b/src/README.UPDATING index dacb5d3aa..0a7811281 100644 --- a/src/README.UPDATING +++ b/src/README.UPDATING @@ -124,7 +124,7 @@ Exim version 4.80 is instead given to gnutls_priority_init(3), which expects a priority string; this behaviour is much closer to the OpenSSL behaviour. See: - http://www.gnu.org/software/gnutls/manual/html_node/Priority-Strings.html + http://www.gnutls.org/manual/html_node/Priority-Strings.html for fuller documentation of the strings parsed. The three gnutls_require_* options are still parsed by Exim and, for this release, silently ignored. diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c index c357ba4e0..c90ae1411 100644 --- a/src/src/tls-gnu.c +++ b/src/src/tls-gnu.c @@ -1005,7 +1005,7 @@ else if (state->tls_sni) "have an SNI set for a client [%s]\n", state->tls_sni); /* This is the priority string support, -http://www.gnu.org/software/gnutls/manual/html_node/Priority-Strings.html +http://www.gnutls.org/manual/html_node/Priority-Strings.html and replaces gnutls_require_kx, gnutls_require_mac & gnutls_require_protocols. This was backwards incompatible, but means Exim no longer needs to track all algorithms and provide string forms for them. */ -- 2.30.2