Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only attempt to load the secret key if we need to (for signing or for

Browse Source 
decrypting).
This commit is contained in:
agc 2011-06-27 07:05:31 +00:00
parent 80229e0feb
commit e5bfab614c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/external/bsd/netpgp/dist/src/lib/netpgp.c vendored
View File

@ -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 @@ netpgp_init(netpgp_t *netpgp)
(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);