Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgp Fix error in merg...
details: https://anonhg.NetBSD.org/src/rev/5bd9d4a880c3
branches: trunk
changeset: 750244:5bd9d4a880c3
user: agc <agc%NetBSD.org@localhost>
date: Tue Dec 22 06:51:31 2009 +0000
description:
Fix error in merge of previous change shown up by regression tests.
diffstat:
crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r 2bf459abafdb -r 5bd9d4a880c3 crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Dec 22 06:03:24 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Dec 22 06:51:31 2009 +0000
@@ -220,7 +220,6 @@
{
int cc;
int n;
- int i;
if (size <= 0) {
(void) fprintf(stderr, "%s\n", header);
@@ -311,7 +310,10 @@
free(out);
return ret;
}
- return netpgp_verify_file(netpgp, f, NULL, p->armour);
+ return netpgp_verify_file(netpgp, f,
+ (p->cmd == VERIFY) ? NULL :
+ (p->output) ? p->output : "-",
+ p->armour);
case LIST_PACKETS:
return nonnull(f, p->progname) &&
netpgp_list_packets(netpgp, f, p->armour, NULL);
Home |
Main Index |
Thread Index |
Old Index