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

Commit b2cc748

Browse files
committed
Remove dead stuff from pgcrypto.
pgp-pubkey-DISABLED test has been unused since 2006, when support for built-in bignum math was added (commit 1abf76e). pgp-encrypt-DISABLED has been unused forever, AFAICS. Also remove a couple of unused error codes.
1 parent 41e2b84 commit b2cc748

File tree

6 files changed

+2
-10
lines changed

6 files changed

+2
-10
lines changed

contrib/pgcrypto/expected/pgp-encrypt-DISABLED.out

-1
This file was deleted.

contrib/pgcrypto/expected/pgp-pubkey-DISABLED.out

-1
This file was deleted.

contrib/pgcrypto/px.c

-4
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ static const struct error_desc px_err_list[] = {
6767
{PXE_PGP_COMPRESSION_ERROR, "Compression error"},
6868
{PXE_PGP_NOT_TEXT, "Not text data"},
6969
{PXE_PGP_UNEXPECTED_PKT, "Unexpected packet in key data"},
70-
{PXE_PGP_NO_BIGNUM,
71-
"public-key functions disabled - "
72-
"pgcrypto needs OpenSSL for bignums"},
7370
{PXE_PGP_MATH_FAILED, "Math operation failed"},
7471
{PXE_PGP_SHORT_ELGAMAL_KEY, "Elgamal keys must be at least 1024 bits long"},
75-
{PXE_PGP_RSA_UNSUPPORTED, "pgcrypto does not support RSA keys"},
7672
{PXE_PGP_UNKNOWN_PUBALGO, "Unknown public-key encryption algorithm"},
7773
{PXE_PGP_WRONG_KEY, "Wrong key"},
7874
{PXE_PGP_MULTIPLE_KEYS,

contrib/pgcrypto/px.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ void px_free(void *p);
8888
#define PXE_PGP_COMPRESSION_ERROR -105
8989
#define PXE_PGP_NOT_TEXT -106
9090
#define PXE_PGP_UNEXPECTED_PKT -107
91-
#define PXE_PGP_NO_BIGNUM -108
91+
/* -108 is unused */
9292
#define PXE_PGP_MATH_FAILED -109
9393
#define PXE_PGP_SHORT_ELGAMAL_KEY -110
94-
#define PXE_PGP_RSA_UNSUPPORTED -111
94+
/* -111 is unused */
9595
#define PXE_PGP_UNKNOWN_PUBALGO -112
9696
#define PXE_PGP_WRONG_KEY -113
9797
#define PXE_PGP_MULTIPLE_KEYS -114

contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql

-1
This file was deleted.

contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql

-1
This file was deleted.

0 commit comments

Comments
 (0)