From e75d99818dd3940be997520e64db8c9e3b207e39 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 21 May 2024 07:05:26 +0200
Subject: Merging upstream version 15.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 doc/src/sgml/pgcrypto.sgml | 68 +---------------------------------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

(limited to 'doc/src/sgml/pgcrypto.sgml')

diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml
index 43fb8db..3ca39c1 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -442,7 +442,7 @@ gen_salt(type text [, iter_count integer ]) returns text
 
   <para>
    The functions here implement the encryption part of the OpenPGP
-   (<ulink url="https://tools.ietf.org/html/rfc4880">RFC 4880</ulink>)
+   (<ulink url="https://datatracker.ietf.org/doc/html/rfc4880">RFC 4880</ulink>)
    standard.  Supported are both symmetric-key and public-key encryption.
   </para>
 
@@ -1220,72 +1220,6 @@ gen_random_uuid() returns uuid
     ciphertexts of a given size.
    </para>
   </sect3>
-
-  <sect3>
-   <title>Useful Reading</title>
-
-   <itemizedlist>
-    <listitem>
-     <para><ulink url="https://www.gnupg.org/gph/en/manual.html"></ulink></para>
-     <para>The GNU Privacy Handbook.</para>
-    </listitem>
-    <listitem>
-     <para><ulink url="https://www.openwall.com/crypt/"></ulink></para>
-     <para>Describes the crypt-blowfish algorithm.</para>
-    </listitem>
-    <listitem>
-     <para>
-      <ulink url="https://www.iusmentis.com/security/passphrasefaq/"></ulink>
-     </para>
-     <para>How to choose a good password.</para>
-    </listitem>
-    <listitem>
-     <para><ulink url="http://world.std.com/~reinhold/diceware.html"></ulink></para>
-     <para>Interesting idea for picking passwords.</para>
-    </listitem>
-    <listitem>
-     <para>
-      <ulink url="http://www.interhack.net/people/cmcurtin/snake-oil-faq.html"></ulink>
-     </para>
-     <para>Describes good and bad cryptography.</para>
-    </listitem>
-   </itemizedlist>
-  </sect3>
-
-  <sect3>
-   <title>Technical References</title>
-
-   <itemizedlist>
-    <listitem>
-     <para><ulink url="https://tools.ietf.org/html/rfc4880"></ulink></para>
-     <para>OpenPGP message format.</para>
-    </listitem>
-    <listitem>
-     <para><ulink url="https://tools.ietf.org/html/rfc1321"></ulink></para>
-     <para>The MD5 Message-Digest Algorithm.</para>
-    </listitem>
-    <listitem>
-     <para><ulink url="https://tools.ietf.org/html/rfc2104"></ulink></para>
-     <para>HMAC: Keyed-Hashing for Message Authentication.</para>
-    </listitem>
-    <listitem>
-     <para>
-      <ulink url="https://www.usenix.org/legacy/events/usenix99/provos.html"></ulink>
-     </para>
-     <para>Comparison of crypt-des, crypt-md5 and bcrypt algorithms.</para>
-    </listitem>
-    <listitem>
-     <para>
-      <ulink url="https://en.wikipedia.org/wiki/Fortuna_(PRNG)"></ulink>
-     </para>
-     <para>Description of Fortuna CSPRNG.</para>
-    </listitem>
-    <listitem>
-     <para><ulink url="https://jlcooke.ca/random/"></ulink></para>
-     <para>Jean-Luc Cooke Fortuna-based <filename>/dev/random</filename> driver for Linux.</para>
-    </listitem>
-   </itemizedlist>
-  </sect3>
  </sect2>
 
  <sect2>
-- 
cgit v1.2.3