From 1ed8e771ade6f2a58728f4537e9c19b702d8cf25 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Sun, 2 Nov 2014 21:43:39 -0500
Subject: [PATCH] Remove dead-since-introduction pgcrypto code.
Marko Tiikkaja
---
contrib/pgcrypto/pgp-decrypt.c | 17 +++++++----------
1 file 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
--
2.40.0