Module Name: src
Committed By: agc
Date: Thu Sep 2 07:31:16 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
If we get passed a key which has no subuids, sigs, fingerprint or any
other data, and has been revoked, don't even attempt to print it out.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.72 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.73
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.72 Thu Sep 2 06:00:12 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu Sep 2 07:31:16 2010
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.72 2010/09/02 06:00:12 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.73 2010/09/02 07:31:16 agc Exp $");
#endif
#include <sys/types.h>
@@ -564,6 +564,11 @@
(void) fprintf(stderr, "formatobj: json is '%s'\n", s);
free(s);
}
+ if (obj->c == 2 && obj->value.v[1].type == MJ_STRING &&
+ strcmp(obj->value.v[1].value.s, "[REVOKED]") == 0) {
+ /* whole key has been rovoked - just return */
+ return;
+ }
pobj(fp, &obj->value.v[mj_object_find(obj, "header", 0, 2) + 1], 0);
p(fp, " ", NULL);
pobj(fp, &obj->value.v[mj_object_find(obj, "key bits", 0, 2) + 1], 0);
