Module Name: src
Committed By: agc
Date: Fri May 7 16:29:09 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3
Log Message:
Sync with reality using patch provided by Juan RP in PR 43259. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
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/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.12 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.13
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.12 Sun Mar 14 00:55:32 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3 Fri May 7 16:29:09 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.12 2010/03/14 00:55:32 agc Exp $
+.\" $NetBSD: libnetpgp.3,v 1.13 2010/05/07 16:29:09 agc Exp $
.\"
.\" Copyright (c) 2009,2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 13, 2010
+.Dd May 5, 2010
.Dt LIBNETPGP 3
.Os
.Sh NAME
@@ -41,7 +41,7 @@
The following functions relate to initialisations and finalisations:
.Ft int
.Fo netpgp_init
-.Fa "netpgp_t *netpgp" "char *userid" "char *pubringfile" "char *secringfile"
+.Fa "netpgp_t *netpgp"
.Fc
.Ft int
.Fo netpgp_end
@@ -175,12 +175,16 @@
function, which will set up the public and private keyrings, and set the
user identity to the
.Ar userid
-argument passed to the function.
-If no public key ring file is provided, initial values will be taken from those
+argument passed stored in the
+.Dv netpgp_t
+structure, and set using the
+.Fn netpgp_setvar
+function.
+If no public key ring file is set, initial values will be taken from those
in the
.Pa .gnupg/pubring.gpg
file in the user's home directory.
-Similarily, if no secret key ring file is provided,
+Similarily, if no secret key ring file is set,
initial values will be taken from those
in the
.Pa .gnupg/secring.gpg
