Module Name: src
Committed By: agc
Date: Mon Jun 27 07:05:32 UTC 2011
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
Log Message:
only attempt to load the secret key if we need to (for signing or for
decrypting).
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 \
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.90 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.91
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.90 Sat Jun 25 00:37:44 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Mon Jun 27 07:05:31 2011
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.90 2011/06/25 00:37:44 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.91 2011/06/27 07:05:31 agc Exp $");
#endif
#include <sys/types.h>
@@ -852,10 +852,12 @@
(void) fprintf(io->errs, "Can't read pub keyring\n");
return 0;
}
- netpgp->secring = readkeyring(netpgp, "secring");
- if (netpgp->secring == NULL) {
- (void) fprintf(io->errs, "Can't read sec keyring\n");
- return 0;
+ if (netpgp_getvar(netpgp, "need seckey")) {
+ netpgp->secring = readkeyring(netpgp, "secring");
+ if (netpgp->secring == NULL) {
+ (void) fprintf(io->errs, "Can't read sec keyring\n");
+ return 0;
+ }
}
} else {
last = (netpgp->pubring != NULL);
