From c28fbd45890469f1e7073ca19f42cbdd308a99be Mon Sep 17 00:00:00 2001 From: Neil Conway <neilc@samurai.com> Date: Wed, 19 Jul 2006 17:05:50 +0000 Subject: [PATCH] pgcrypto merge cleanup: - Few README fixes - Keep imath Id string, put $PostgreSQL$ separately. Patch from Marko Kreen. --- contrib/pgcrypto/README.pgcrypto | 17 +++++++++-------- contrib/pgcrypto/imath.c | 3 ++- contrib/pgcrypto/imath.h | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/contrib/pgcrypto/README.pgcrypto b/contrib/pgcrypto/README.pgcrypto index 5cacaf875ca..db60df99093 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 @@ -713,4 +714,4 @@ http://www.cs.ut.ee/~helger/crypto/[]:: Collection of cryptology pointers. -// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.15 2006/07/13 04:15:24 neilc Exp $ +// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.16 2006/07/19 17:05:50 neilc Exp $ diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c index f2501904ad9..17d90ed0398 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: pgsql/contrib/pgcrypto/imath.c,v 1.3 2006/07/16 02:44:00 tgl Exp $ + 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: pgsql/contrib/pgcrypto/imath.c,v 1.4 2006/07/19 17:05:50 neilc Exp $ */ #include "postgres.h" #include "px.h" diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h index 3cd23b67687..67adb3bf452 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: pgsql/contrib/pgcrypto/imath.h,v 1.3 2006/07/16 02:44:01 tgl Exp $ + 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: pgsql/contrib/pgcrypto/imath.h,v 1.4 2006/07/19 17:05:50 neilc Exp $ */ #ifndef IMATH_H_ #define IMATH_H_ -- GitLab