Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 98bb697

Browse files
committed
pgcrypto doc updates
Marko Kreen
1 parent c7d7c15 commit 98bb697

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

doc/src/sgml/pgcrypto.sgml

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.4 2008/01/05 13:17:00 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.5 2008/01/17 11:06:28 mha Exp $ -->
22

33
<sect1 id="pgcrypto">
44
<title>pgcrypto</title>
@@ -26,8 +26,10 @@
2626
<para>
2727
Computes a binary hash of the given <parameter>data</>.
2828
<parameter>type</> is the algorithm to use.
29-
Standard algorithms are <literal>md5</literal> and
30-
<literal>sha1</literal>. If <filename>pgcrypto</> was built with
29+
Standard algorithms are <literal>md5</literal>, <literal>sha1</literal>,
30+
<literal>sha224</literal>, <literal>sha256</literal>,
31+
<literal>sha384</literal> and <literal>sha512</literal>.
32+
If <filename>pgcrypto</> was built with
3133
OpenSSL, more algorithms are available, as detailed in
3234
<xref linkend="pgcrypto-with-without-openssl">.
3335
</para>
@@ -390,7 +392,7 @@
390392
<title>PGP encryption functions</title>
391393

392394
<para>
393-
The functions here implement the encryption part of the OpenPGP (RFC 2440)
395+
The functions here implement the encryption part of the OpenPGP (RFC 4880)
394396
standard. Supported are both symmetric-key and public-key encryption.
395397
</para>
396398

@@ -657,7 +659,7 @@
657659

658660
<para>
659661
Which compression algorithm to use. Only available if
660-
<filename>pgcrypto</> was built with zlib.
662+
<productname>PostgreSQL<productname/> was built with zlib.
661663
</para>
662664
<programlisting>
663665
Values:
@@ -689,7 +691,7 @@
689691
<para>
690692
Whether to convert <literal>\n</literal> into <literal>\r\n</literal> when
691693
encrypting and <literal>\r\n</literal> to <literal>\n</literal> when
692-
decrypting. RFC 2440 specifies that text data should be stored using
694+
decrypting. RFC 4880 specifies that text data should be stored using
693695
<literal>\r\n</literal> line-feeds. Use this to get fully RFC-compliant
694696
behavior.
695697
</para>
@@ -706,7 +708,7 @@
706708
<para>
707709
Do not protect data with SHA-1. The only good reason to use this
708710
option is to achieve compatibility with ancient PGP products, predating
709-
the addition of SHA-1 protected packets to RFC 2440.
711+
the addition of SHA-1 protected packets to RFC 4880.
710712
Recent gnupg.org and pgp.com software supports it fine.
711713
</para>
712714
<programlisting>
@@ -1172,15 +1174,9 @@
11721174

11731175
<itemizedlist>
11741176
<listitem>
1175-
<para><ulink url="http://www.ietf.org/rfc/rfc2440.txt"></ulink></para>
1177+
<para><ulink url="http://www.ietf.org/rfc/rfc4880.txt"></ulink></para>
11761178
<para>OpenPGP message format.</para>
11771179
</listitem>
1178-
<listitem>
1179-
<para>
1180-
<ulink url="http://www.imc.org/draft-ietf-openpgp-rfc2440bis"></ulink>
1181-
</para>
1182-
<para>New version of RFC 2440.</para>
1183-
</listitem>
11841180
<listitem>
11851181
<para><ulink url="http://www.ietf.org/rfc/rfc1321.txt"></ulink></para>
11861182
<para>The MD5 Message-Digest Algorithm.</para>

0 commit comments

Comments
 (0)