Update README and links to required libraries.

diff --git a/README b/README
index 63075994852dc790162ffdfcecc532102614c994..db6a80e07ff41e852733457b4d3019cf71ea0156 100644 (file)
--- a/README
+++ b/README
@@ -50,9 +50,9 @@ ensure you have the latest stable versions of all the required libraries:
 
 The following libraries are used by default, but can be disabled if necessary:
 
 
 The following libraries are used by default, but can be disabled if necessary:
 

-- zlib (http://www.zlib.net/)
+- zlib (https://zlib.net/)

 - LZO (https://www.oberhumer.com/opensource/lzo/)
 - LZO (https://www.oberhumer.com/opensource/lzo/)

-- ncurses (http://invisible-island.net/ncurses/)
+- ncurses (https://invisible-island.net/ncurses/)

 - readline (https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html)
 
 
 - readline (https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html)
 
 


@@ -68,8 +68,8 @@ be forwarded by intermediate nodes.
 
 Tinc 1.1 support two protocols. The first is a legacy protocol that provides
 backwards compatibility with tinc 1.0 nodes, and which by default uses 2048 bit
 
 Tinc 1.1 support two protocols. The first is a legacy protocol that provides
 backwards compatibility with tinc 1.0 nodes, and which by default uses 2048 bit

-RSA keys for authentication, and encrypts traffic using Blowfish in CBC mode
-and HMAC-SHA1. The second is a new protocol which uses Curve25519 keys for
+RSA keys for authentication, and encrypts traffic using AES256 in CBC mode
+and HMAC-SHA256. The second is a new protocol which uses Curve25519 keys for

 authentication, and encrypts traffic using Chacha20-Poly1305, and provides
 forward secrecy.
 
 authentication, and encrypts traffic using Chacha20-Poly1305, and provides
 forward secrecy.
 

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 77215f1dd1ba809da75efa4b65f76ad112aab06e..a16c5ca0533d3021fec91dcf8b451d769749cf4d 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -331,14 +331,14 @@ as explained in the rest of the documentation.
 @cindex requirements
 @cindex libraries
 Before you can configure or build tinc, you need to have the LibreSSL or OpenSSL, zlib,
 @cindex requirements
 @cindex libraries
 Before you can configure or build tinc, you need to have the LibreSSL or OpenSSL, zlib,

-lzo, curses and readline libraries installed on your system.  If you try to
+LZO, curses and readline libraries installed on your system.  If you try to

 configure tinc without having them installed, configure will give you an error
 message, and stop.
 
 @menu
 * LibreSSL/OpenSSL::
 * zlib::
 configure tinc without having them installed, configure will give you an error
 message, and stop.
 
 @menu
 * LibreSSL/OpenSSL::
 * zlib::

-* lzo::
+* LZO::

 * libcurses::
 * libreadline::
 @end menu
 * libcurses::
 * libreadline::
 @end menu


@@ -363,7 +363,7 @@ of this package.
 
 If your operating system comes neither with LibreSSL or OpenSSL, you have to
 install one manually.  It is recommended that you get the latest version of
 
 If your operating system comes neither with LibreSSL or OpenSSL, you have to
 install one manually.  It is recommended that you get the latest version of

-LibreSSL from @url{http://www.libressl.org/}.  Instructions on how to
+LibreSSL from @url{https://www.libressl.org/}.  Instructions on how to

 configure, build and install this package are included within the package.
 Please make sure you build development and runtime libraries (which is the
 default).
 configure, build and install this package are included within the package.
 Please make sure you build development and runtime libraries (which is the
 default).


@@ -430,17 +430,17 @@ available.  Make sure you install the development AND runtime versions
 of this package.
 
 If you have to install zlib manually, you can get the source code
 of this package.
 
 If you have to install zlib manually, you can get the source code

-from @url{http://www.zlib.net/}.  Instructions on how to configure,
+from @url{https://zlib.net/}.  Instructions on how to configure,

 build and install this package are included within the package.  Please
 make sure you build development and runtime libraries (which is the
 default).
 
 
 @c ==================================================================
 build and install this package are included within the package.  Please
 make sure you build development and runtime libraries (which is the
 default).
 
 
 @c ==================================================================

-@node       lzo
-@subsection lzo
+@node       LZO
+@subsection LZO

 
 

-@cindex lzo
+@cindex LZO

 Another form of compression is offered using the LZO library.
 
 If this library is not installed, you will get an error when running the
 Another form of compression is offered using the LZO library.
 
 If this library is not installed, you will get an error when running the


@@ -453,7 +453,7 @@ You can use your operating system's package manager to install this if
 available.  Make sure you install the development AND runtime versions
 of this package.
 
 available.  Make sure you install the development AND runtime versions
 of this package.
 

-If you have to install lzo manually, you can get the source code
+If you have to install LZO manually, you can get the source code

 from @url{https://www.oberhumer.com/opensource/lzo/}.  Instructions on how to configure,
 build and install this package are included within the package.  Please
 make sure you build development and runtime libraries (which is the
 from @url{https://www.oberhumer.com/opensource/lzo/}.  Instructions on how to configure,
 build and install this package are included within the package.  Please
 make sure you build development and runtime libraries (which is the


@@ -473,9 +473,9 @@ all functionality that depends on a curses library by using the
 "--disable-curses" option when running the configure script.
 
 There are several curses libraries. It is recommended that you install
 "--disable-curses" option when running the configure script.
 
 There are several curses libraries. It is recommended that you install

-"ncurses" (@url{http://invisible-island.net/ncurses/}),
+"ncurses" (@url{https://invisible-island.net/ncurses/}),

 however other curses libraries should also work.
 however other curses libraries should also work.

-In particular, "PDCurses" (@url{http://pdcurses.sourceforge.net/})
+In particular, "PDCurses" (@url{https://pdcurses.sourceforge.io/})

 is recommended if you want to compile tinc for Windows.
 
 You can use your operating system's package manager to install this if
 is recommended if you want to compile tinc for Windows.
 
 You can use your operating system's package manager to install this if


@@ -500,7 +500,7 @@ available.  Make sure you install the development AND runtime versions
 of this package.
 
 If you have to install libreadline manually, you can get the source code from
 of this package.
 
 If you have to install libreadline manually, you can get the source code from

-@url{http://www.gnu.org/software/readline/}. Instructions on how to configure,
+@url{https://www.gnu.org/software/readline/}. Instructions on how to configure,

 build and install this package are included within the package.  Please make
 sure you build development and runtime libraries (which is the default).
 
 build and install this package are included within the package.  Please make
 sure you build development and runtime libraries (which is the default).
 


@@ -691,7 +691,7 @@ you will not find the answers in this documentation.
 Make sure you have an adequate understanding of networks in general.
 @cindex Network Administrators Guide
 A good resource on networking is the
 Make sure you have an adequate understanding of networks in general.
 @cindex Network Administrators Guide
 A good resource on networking is the

-@uref{http://www.tldp.org/LDP/nag2/, Linux Network Administrators Guide}.
+@uref{https://www.tldp.org/LDP/nag2/, Linux Network Administrators Guide}.

 
 If you have everything clearly pictured in your mind,
 proceed in the following order:
 
 If you have everything clearly pictured in your mind,
 proceed in the following order:


@@ -1336,7 +1336,7 @@ Fragmentation Needed or Packet too Big messages are dropped by firewalls.
 @item Compression = <@var{level}> (0)
 This option sets the level of compression used for UDP packets.
 Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib),
 @item Compression = <@var{level}> (0)
 This option sets the level of compression used for UDP packets.
 Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib),

-10 (fast lzo) and 11 (best lzo).
+10 (fast LZO) and 11 (best LZO).

 
 @cindex Digest
 @item Digest = <@var{digest}> (sha1)
 
 @cindex Digest
 @item Digest = <@var{digest}> (sha1)