Remove dead stuff from pgcrypto.

pgp-pubkey-DISABLED test has been unused since 2006, when support for
built-in bignum math was added (commit 1abf76e8). pgp-encrypt-DISABLED has
been unused forever, AFAICS.

Also remove a couple of unused error codes.

diff --git a/contrib/pgcrypto/expected/pgp-encrypt-DISABLED.out b/contrib/pgcrypto/expected/pgp-encrypt-DISABLED.out
deleted file mode 100644 (file)
index 4122300..0000000
--- a/contrib/pgcrypto/expected/pgp-encrypt-DISABLED.out
+++ /dev/null
@@ -1 +0,0 @@
--- no random source

diff --git a/contrib/pgcrypto/expected/pgp-pubkey-DISABLED.out b/contrib/pgcrypto/expected/pgp-pubkey-DISABLED.out
deleted file mode 100644 (file)
index d35c097..0000000
--- a/contrib/pgcrypto/expected/pgp-pubkey-DISABLED.out
+++ /dev/null
@@ -1 +0,0 @@
--- no bignum support

diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
index 7e69da696f75e25a1e8254e8a1260074e4710abf..b01701ea7509eb8217d9c8c1dfbc55968a3bffa4 100644 (file)
--- a/contrib/pgcrypto/px.c
+++ b/contrib/pgcrypto/px.c
@@ -67,12 +67,8 @@ static const struct error_desc px_err_list[] = {
        {PXE_PGP_COMPRESSION_ERROR, "Compression error"},
        {PXE_PGP_NOT_TEXT, "Not text data"},
        {PXE_PGP_UNEXPECTED_PKT, "Unexpected packet in key data"},
-       {PXE_PGP_NO_BIGNUM,
-               "public-key functions disabled - "
-       "pgcrypto needs OpenSSL for bignums"},
        {PXE_PGP_MATH_FAILED, "Math operation failed"},
        {PXE_PGP_SHORT_ELGAMAL_KEY, "Elgamal keys must be at least 1024 bits long"},
-       {PXE_PGP_RSA_UNSUPPORTED, "pgcrypto does not support RSA keys"},
        {PXE_PGP_UNKNOWN_PUBALGO, "Unknown public-key encryption algorithm"},
        {PXE_PGP_WRONG_KEY, "Wrong key"},
        {PXE_PGP_MULTIPLE_KEYS,

diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index 9174e137dba603faa355bb88d4a144182375ec02..800c552bf6089dfd77ecc48faa0f7b0e94832bff 100644 (file)
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -88,10 +88,10 @@ void                px_free(void *p);
 #define PXE_PGP_COMPRESSION_ERROR      -105
 #define PXE_PGP_NOT_TEXT                       -106
 #define PXE_PGP_UNEXPECTED_PKT         -107
-#define PXE_PGP_NO_BIGNUM                      -108
+/* -108 is unused */
 #define PXE_PGP_MATH_FAILED                    -109
 #define PXE_PGP_SHORT_ELGAMAL_KEY      -110
-#define PXE_PGP_RSA_UNSUPPORTED                -111
+/* -111 is unused */
 #define PXE_PGP_UNKNOWN_PUBALGO                -112
 #define PXE_PGP_WRONG_KEY                      -113
 #define PXE_PGP_MULTIPLE_KEYS          -114

diff --git a/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql b/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql
deleted file mode 100644 (file)
index 4122300..0000000
--- a/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql
+++ /dev/null
@@ -1 +0,0 @@
--- no random source

diff --git a/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql b/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql
deleted file mode 100644 (file)
index d35c097..0000000
--- a/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql
+++ /dev/null
@@ -1 +0,0 @@
--- no bignum support