Skip to content

P
Postgres FD Implementation
Commit 1ed8e771 authored by Noah Misch's avatar Noah Misch
Browse files
Options

Remove dead-since-introduction pgcrypto code. 

Marko Tiikkaja
parent c40212ba
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
contrib/pgcrypto/pgp-decrypt.c
View file @ 1ed8e771
...@@ -1069,7 +1069,7 @@ pgp_skip_packet(PullFilter *pkt) ...@@ -1069,7 +1069,7 @@ pgp_skip_packet(PullFilter *pkt)
while (res > 0) while (res > 0)
res = pullf_read(pkt, 32 * 1024, &tmp); res = pullf_read(pkt, 32 * 1024, &tmp);
return res < 0 ? res : 0; return res;
} }
/* /*
...@@ -1078,19 +1078,16 @@ pgp_skip_packet(PullFilter *pkt) ...@@ -1078,19 +1078,16 @@ pgp_skip_packet(PullFilter *pkt)
int int
pgp_expect_packet_end(PullFilter *pkt) pgp_expect_packet_end(PullFilter *pkt)
{ {
int res = 1; int res;
uint8 *tmp; uint8 *tmp;
while (res > 0) res = pullf_read(pkt, 32 * 1024, &tmp);
if (res > 0)
{ {
res = pullf_read(pkt, 32 * 1024, &tmp); px_debug("pgp_expect_packet_end: got data");
if (res > 0) return PXE_PGP_CORRUPT_DATA;
{
px_debug("pgp_expect_packet_end: got data");
return PXE_PGP_CORRUPT_DATA;
}
} }
return res < 0 ? res : 0; return res;
} }
int int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment