CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: khorben Date: Mon Mar 27 21:34:32 UTC 2017 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: Also document alternate option "--detach" Submitted on tech-pkg@ as: [PATCH 08/11] Also document alternate option "--detach" To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.21 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20 Mon Mar 27 21:30:23 2017 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Mon Mar 27 21:34:32 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: netpgp.1,v 1.20 2017/03/27 21:30:23 khorben Exp $ +.\" $NetBSD: netpgp.1,v 1.21 2017/03/27 21:34:32 khorben Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -216,7 +216,7 @@ access to the cipher used. The default cipher algorithm is the .Dq CAST5 algorithm. -.It Fl Fl detached +.It Fl Fl detach , Fl Fl detached When signing a file, place the resulting signature in a separate file from the one being signed. .It Fl Fl hash-alg Ar hash-algorithm
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: khorben Date: Mon Mar 27 21:30:23 UTC 2017 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: Correct option "--armor" Submitted on tech-pkg@ as: [PATCH 07/11] Correct option "--armor" To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.19 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.20 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.19 Mon Feb 17 07:23:18 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Mon Mar 27 21:30:23 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: netpgp.1,v 1.19 2014/02/17 07:23:18 agc Exp $ +.\" $NetBSD: netpgp.1,v 1.20 2017/03/27 21:30:23 khorben Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -203,7 +203,7 @@ library. In addition to one of the preceding commands, a number of qualifiers or options may be given. .Bl -tag -width Ar -.It Fl Fl armour , Fl armor +.It Fl Fl armour , Fl Fl armor This option, however it is spelled, wraps the signature as an ASCII-encoded piece of text, for ease of use. .It Fl Fl cipher Ar ciphername
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Fri Nov 5 07:39:59 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.am Log Message: Explicitly link netpgp with libmj, rather than letting libnetpgp bring it in. Fixes a build issue on RHEL 6. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am 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/netpgp/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.1 Tue Jun 9 00:51:03 2009 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am Fri Nov 5 07:39:59 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.1 2009/06/09 00:51:03 agc Exp $ +## $NetBSD: Makefile.am,v 1.2 2010/11/05 07:39:59 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -8,7 +8,7 @@ netpgp_CPPFLAGS = -I$(top_srcdir)/include -netpgp_LDADD = ../lib/libnetpgp.la +netpgp_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la man1_MANS = netpgp.1
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Thu Nov 4 15:39:09 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.in netpgp.1 netpgp.c Log Message: allow user-specification of cipher to be used when encrypting packets. at the user level, this is specified using the --cipher=ciphername option. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/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/netpgp/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.5 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 Sat Aug 7 04:23:56 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in Thu Nov 4 15:39:08 2010 @@ -81,26 +81,19 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -109,9 +102,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ +LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ @OPENSSL_LIBS@ +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -148,9 +141,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.16 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.15 Wed Nov 3 02:36:12 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Thu Nov 4 15:39:08 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.15 2010/11/03 02:36:12 agc Exp $ +.\ $NetBSD: netpgp.1,v 1.16 2010/11/04 15:39:08 agc Exp $ .\ .\ Copyright (c) 2009 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 August 9, 2010 +.Dd November 4, 2010 .Dt NETPGP 1 .Os .Sh NAME @@ -85,9 +85,11 @@ .Pp where the long options for all commands are: .Pp +.Op Fl Fl cipher Ns = Ns Ar ciphername +.br .Op Fl Fl coredumps .br -.Op Fl Fl homedir Ns = Ns Ar home-directory +.Op Fl Fl homedir Ns = Ns Ar home\-directory .br .Op Fl Fl keyring Ns = Ns Ar keyring .br @@ -202,6 +204,16 @@ .It Fl Fl armour , Fl armor This option, however it is spelled, wraps the signature as an ASCII-encoded piece of text, for ease of use. +.It Fl Fl cipher Ar ciphername +can be used to specify the symmetric encryption algorithm (or +cipher) which is used when encrypting data. +To decrypt this data, the same cipher will be needed, +so care should be taken at encryption time to make sure +that the person who decrypts the data has +access to the cipher used. +The default cipher algorithm is the +.Dq CAST5 +algorithm. .It Fl Fl detached When signing a file, place the resulting signature in a separate file from the one being signed. @@ -217,7 +229,7 @@ may also be used, although it is recommended that SHA256 be used, due to recent advances in generating collisions for the SHA1 hashing algorithm. -.It Fl Fl homedir Ar home-directory +.It Fl Fl homedir Ar home\-directory Keyrings are normally located, for historical reasons, within the user's home directory in a subdirectory called .Dq Pa .gnupg Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.15 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.16 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.15 Wed Sep 8 03:21:22 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Thu Nov 4 15:39:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: netpgp.c,v 1.15 2010/09/08 03:21:22 agc Exp $ */ +/* $NetBSD: netpgp.c,v 1.16 2010/11/04 15:39:08 agc Exp $ */ /*- * Copyright (c) 2009 The NetBSD
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Sat Aug 7 04:23:56 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.in Log Message: use any alternate location for openssl To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in 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/netpgp/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in:1.3 Sat Aug 7 04:16:40 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in Sat Aug 7 04:23:56 2010 @@ -81,19 +81,26 @@ CANONICAL_HOST = @CANONICAL_HOST@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @OPENSSL_INCLUDES@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @OPENSSL_INCLUDES@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -102,9 +109,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @OPENSSL_LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @OPENSSL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -141,7 +148,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Fri May 7 05:58:25 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: Remove a duplicate example - from Juan RP in private mail - thanks! To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.12 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.11 Sat Mar 20 20:34:56 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Fri May 7 05:58:25 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.11 2010/03/20 20:34:56 joerg Exp $ +.\ $NetBSD: netpgp.1,v 1.12 2010/05/07 05:58:25 agc Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -470,43 +470,6 @@ \...contents of original file... % .Ed -.Pp -For operations like signing and encrypting a file at the same time, -the best way is to make use of pipelines: -.Bd -literal -% netpgp --sign \*[Lt] example | netpgp --encrypt --userid=c0596823 \*[Gt] example.gpg -netpgp: default key set to C0596823 -pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] -uid Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] -uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] -uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] -uid Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] -netpgp passphrase: -% netpgp --decrypt \*[Lt] example.gpg | netpgp --cat -netpgp: default key set to C0596823 -netpgp: default key set to C0596823 -pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] -uid Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] -uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] -uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] -uid Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] -netpgp passphrase: -Good signature for \*[Lt]stdin\*[Gt] made Mon Feb 22 07:21:19 2010 -using RSA (Encrypt or Sign) key 1b68dcfcc0596823 -pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] -uid Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] -uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] -uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] -uid Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] -\...contents of original file... -% -.Ed .Sh RETURN VALUES The .Nm
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: joerg Date: Sat Mar 20 20:34:56 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: Quote lines that start with . and should appear literally. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.10 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.11 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.10 Fri Mar 5 16:01:10 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Sat Mar 20 20:34:56 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.10 2010/03/05 16:01:10 agc Exp $ +.\ $NetBSD: netpgp.1,v 1.11 2010/03/20 20:34:56 joerg Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -467,7 +467,7 @@ uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] uid Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] -...contents of original file... +\...contents of original file... % .Ed .Pp @@ -504,7 +504,7 @@ uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] uid Alistair Crooks (Yahoo!) \*[lt]agcro...@yahoo-inc.com\*[gt] -...contents of original file... +\...contents of original file... % .Ed .Sh RETURN VALUES
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: wiz Date: Wed Feb 24 08:22:59 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: New sentence, new line; remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.9 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.8 Tue Feb 23 01:24:45 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Wed Feb 24 08:22:58 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.8 2010/02/23 01:24:45 agc Exp $ +.\ $NetBSD: netpgp.1,v 1.9 2010/02/24 08:22:58 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -270,17 +270,18 @@ the user. .It Fl Fl from Ns = Ns Ar signature-valid-from This option allows the signer to specify a time as the -starting point for validity of the signature. In this way -it is possible to prevent files from being verified until a -specific point in time. The time can be specified either -in +starting point for validity of the signature. +In this way it is possible to prevent files from being verified +until a specific point in time. +The time can be specified either in .Dv -MM-DD format, or as the number of seconds since the epoch. .It Fl Fl duration Ns = Ns Ar signature-valid-to This option allows the signer to specify a time as the -end point for validity of the signature. In this way -it is possible to prevent files from being verified after a -specific point in time. The time can be specified either +end point for validity of the signature. +In this way it is possible to prevent files from being verified +after a specific point in time. +The time can be specified either in .Dv -MM-DD format, or as the number of seconds. @@ -411,20 +412,20 @@ .Nm commands can be used together in a pipeline to produce the desired effect. .Bd -literal -% netpgp --sign \*[Lt] a | netpgp --cat \*[Gt] b +% netpgp --sign \*[Lt] a | netpgp --cat \*[Gt] b netpgp: default key set to C0596823 netpgp: default key set to C0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 +Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks \*[lt]...@netbsd.org\*[gt] uid Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] uid Alistair Crooks \*[lt]...@alistaircrooks.com\*[gt] uid Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] -netpgp passphrase: +netpgp passphrase: Good signature for \*[Lt]stdin\*[Gt] made Mon Dec 21 18:25:02 2009 using RSA (Encrypt or Sign) key 1b68dcfcc0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 +Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks \*[lt]alist...@hockley-crooks.com\*[gt] uid Alistair Crooks \*[lt]...@pkgsrc.org\*[gt] uid Alistair Crooks \*[lt]...@netbsd.org\*[gt]
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src
Committed By: agc
Date: Tue Dec 22 06:51:31 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
Log Message:
Fix error in merge of previous change shown up by regression tests.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/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/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 Tue Dec 22 06:03:25 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Dec 22 06:51:31 2009
@@ -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);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src
Committed By: agc
Date: Mon Dec 7 16:17:57 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
Log Message:
The internal variable sshetcdir has been renamed to sshkeydir
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/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/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.6 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.6 Sat Dec 5 07:08:19 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Mon Dec 7 16:17:57 2009
@@ -286,7 +286,7 @@
/* set some defaults */
netpgp_setvar(netpgp, hash, DEFAULT_HASH_ALG);
set_homedir(netpgp, getenv(HOME), /.gnupg, 1);
- netpgp_setvar(netpgp, sshetcdir, /etc/ssh);
+ netpgp_setvar(netpgp, sshkeydir, /etc/ssh);
optindex = 0;
while ((ch = getopt_long(argc, argv, , options, optindex)) != -1) {
switch (options[optindex].val) {
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Sat Dec 5 07:33:18 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1 Log Message: Update the manual page for the addition of ssh host keys. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 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/netpgp/netpgp.1 diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.3 Thu Jun 11 01:12:42 2009 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Sat Dec 5 07:33:18 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: netpgp.1,v 1.3 2009/06/11 01:12:42 agc Exp $ +.\ $NetBSD: netpgp.1,v 1.4 2009/12/05 07:33:18 agc Exp $ .\ .\ Copyright (c) 2009 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 June 10, 2009 +.Dd December 4, 2009 .Dt NETPGP 1 .Os .Sh NAME @@ -87,6 +87,8 @@ .br .Op Fl Fl results Ns = Ns Ar filename .br +.Op Fl Fl ssh-keys +.br .Op Fl Fl userid Ns = Ns Ar userid .br .Op Fl Fl verbose @@ -229,6 +231,15 @@ specifies a filename to which the results of the operation should be sent. The default is to send the results to stderr. +.It Fl Fl ssh-keys +specifies that the public and private keys should be taken +from the +.Xr ssh 1 +host key files, usually found in +.Pa /etc/ssh/ssh_host_rsa_key +and +.Pa /etc/ssh/ssh_host_rsa_key.pub +for the private and public host keys. .It Fl Fl userid Ar userid This option specifies the user identity to be used for all operations. This identity can either be in the form of the full name, or as an @@ -369,6 +380,7 @@ or 2 if any other error occurs. .Sh SEE ALSO .Xr netpgpkeys 1 , +.Xr ssh 1 , .Xr getpass 3 , .\ .Xr libbz2 3 , .Xr libnetpgp 3 ,
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src
Committed By: agc
Date: Tue Jun 30 18:54:20 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
Log Message:
Check that a filename has been given, where one has required. Fixes a bug
reported by Mark Kirby.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/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/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.4 Sat Jun 13 05:25:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Jun 30 18:54:20 2009
@@ -159,6 +159,17 @@
progname, progname, usagemsg);
}
+/* check the file is not NULL */
+static int
+nonnull(char *f, char *progname)
+{
+ if (f == NULL) {
+ (void) fprintf(stderr, %s: No filename provided\n, progname);
+ return 0;
+ }
+ return 1;
+}
+
/* do a command once for a specified file 'f' */
static int
netpgp_cmd(netpgp_t *netpgp, prog_t *p, char *f)
@@ -167,30 +178,37 @@
switch (p-cmd) {
case ENCRYPT:
- return netpgp_encrypt_file(netpgp,
+ return nonnull(f, p-progname)
+ netpgp_encrypt_file(netpgp,
netpgp_getvar(netpgp, userid),
f, p-output,
p-armour);
case DECRYPT:
- return netpgp_decrypt_file(netpgp, f, p-output, p-armour);
+ return nonnull(f, p-progname)
+ netpgp_decrypt_file(netpgp, f, p-output, p-armour);
case SIGN:
- return netpgp_sign_file(netpgp,
+ return nonnull(f, p-progname)
+ netpgp_sign_file(netpgp,
netpgp_getvar(netpgp, userid),
f, p-output,
p-armour, !cleartext, p-detached);
case CLEARSIGN:
- return netpgp_sign_file(netpgp,
+ return nonnull(f, p-progname)
+ netpgp_sign_file(netpgp,
netpgp_getvar(netpgp, userid),
f, p-output,
p-armour, cleartext, p-detached);
case VERIFY:
- return netpgp_verify_file(netpgp, f, NULL, p-armour);
+ return nonnull(f, p-progname)
+ netpgp_verify_file(netpgp, f, NULL, p-armour);
case VERIFY_CAT:
- return netpgp_verify_file(netpgp, f,
+ return nonnull(f, p-progname)
+ netpgp_verify_file(netpgp, f,
(p-output) ? p-output : -,
p-armour);
case LIST_PACKETS:
- return netpgp_list_packets(netpgp, f, p-armour, NULL);
+ return nonnull(f, p-progname)
+ netpgp_list_packets(netpgp, f, p-armour, NULL);
case HELP_CMD:
default:
print_usage(usage, p-progname);
