pgcrypto merge cleanup:

  - Few README fixes
  - Keep imath Id string, put $PostgreSQL$ separately.

Patch from Marko Kreen.

3 files changed, 12 insertions, 9 deletions

diff --git a/contrib/pgcrypto/README.pgcrypto b/contrib/pgcrypto/README.pgcrypto
index 1419690f7c..806a122aed 100644
--- a/contrib/pgcrypto/README.pgcrypto
+++ b/contrib/pgcrypto/README.pgcrypto
@@ -36,13 +36,14 @@ pgcrypto configures itself according to the findings of main PostgreSQL
 `configure` script.  The options that affect it are `--with-zlib` and
 `--with-openssl`.
 
-Without zlib, the PGP functions will not support compressed data inside
-PGP encrypted packets.
+When compiled with zlib, PGP encryption functions are able to
+compress data before encrypting.
 
-Without OpenSSL, public-key encryption does not work, as pgcrypto does
-not yet contain math functions for large integers.
+When compiled with OpenSSL there will be more algorithms available.
+Also public-key encryption functions will be faster as OpenSSL
+has more optimized BIGNUM functions.
 
-There are some other differences with and without OpenSSL:
+Summary of functionality with and without OpenSSL:
 
 `----------------------------`---------`------------
  Functionality                built-in   OpenSSL
@@ -421,7 +422,7 @@ with CRC and additional formatting.
 Options are named to be similar to GnuPG.  Values should be given after
 an equal sign; separate options from each other with commas.  Example:
 
-  pgp_sym_encrypt(data, psw, 'compress-also=1, cipher-algo=aes256')
+  pgp_sym_encrypt(data, psw, 'compress-algo=1, cipher-algo=aes256')
 
 All of the options except `convert-crlf` apply only to encrypt
 functions.  Decrypt functions get the parameters from PGP data.
@@ -571,7 +572,7 @@ The GNU Privacy Handbook] and other docs on http://www.gnupg.org[] site.
 -------------------
 
 Those functions only run a cipher over data, they don't have any advanced
-features of PGP encryption.  In addition, they have some major problems:
+features of PGP encryption.  Therefore they have some major problems:
 
 1. They use user key directly as cipher key.
 2. They don't provide any integrity checking, to see
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index ca8db0058c..67587dcc28 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -3,7 +3,7 @@
   Name:     imath.c
   Purpose:  Arbitrary precision integer arithmetic routines.
   Author:   M. J. Fromberger <http://www.dartmouth.edu/~sting/>
-  Info:     $PostgreSQL$
+  Info:     Id: imath.c 21 2006-04-02 18:58:36Z sting
 
   Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
 
@@ -27,6 +27,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
  */
+/* $PostgreSQL$ */
 
 #include "postgres.h"
 #include "px.h"
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index b670eb3f0a..ca0e24a92c 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -2,7 +2,7 @@
   Name:     imath.h
   Purpose:  Arbitrary precision integer arithmetic routines.
   Author:   M. J. Fromberger <http://www.dartmouth.edu/~sting/>
-  Info:     $PostgreSQL$
+  Info:     Id: imath.h 21 2006-04-02 18:58:36Z sting
 
   Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
 
@@ -26,6 +26,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
  */
+/* $PostgreSQL$ */
 
 #ifndef IMATH_H_
 #define IMATH_H_