summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2014-11-03 02:43:39 +0000
committerNoah Misch2014-11-03 02:43:39 +0000
commit1ed8e771ade6f2a58728f4537e9c19b702d8cf25 (patch)
treefa1d5d3fb0f3c5cb370d6b9577046643ff8c151c
parentc40212baf6c093b4958c6e04ddde94869788a572 (diff)
Remove dead-since-introduction pgcrypto code.
Marko Tiikkaja
-rw-r--r--contrib/pgcrypto/pgp-decrypt.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index e03ee7f5f0..9aabd66e7e 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -1069,7 +1069,7 @@ pgp_skip_packet(PullFilter *pkt)
while (res > 0)
res = pullf_read(pkt, 32 * 1024, &tmp);
- return res < 0 ? res : 0;
+ return res;
}
/*
@@ -1078,19 +1078,16 @@ pgp_skip_packet(PullFilter *pkt)
int
pgp_expect_packet_end(PullFilter *pkt)
{
- int res = 1;
+ int res;
uint8 *tmp;
- while (res > 0)
+ res = pullf_read(pkt, 32 * 1024, &tmp);
+ if (res > 0)
{
- res = pullf_read(pkt, 32 * 1024, &tmp);
- if (res > 0)
- {
- px_debug("pgp_expect_packet_end: got data");
- 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