Module Name: src
Committed By: agc
Date: Fri May 22 02:28:54 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac tst
src/crypto/external/bsd/netpgp/dist/src/bin: netpgp.1 netpgp.c
src/crypto/external/bsd/netpgp/dist/src/lib: config.h packet.h
version.h
Log Message:
CHANGES 1.99.2 -> 1.99.3
+ modified regression tests to make it easier to see status messages
+ modified --encrypt, --decrypt, --sign, and --clearsign as well as --cat
to respect the --output argument for the output file. Default behaviour
remains unchanged - if --output is not specified, standard file names
and suffixes apply. Note that --verify has not been changed - this is
for compatibility with gpg, POLA/POLS, and because --verify-cat/--cat
provides this behaviour
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/netpgp/dist/configure \
src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/lib/config.h \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
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/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.10 src/crypto/external/bsd/netpgp/dist/TODO:1.11
--- src/crypto/external/bsd/netpgp/dist/TODO:1.10 Thu May 21 00:35:01 2009
+++ src/crypto/external/bsd/netpgp/dist/TODO Fri May 22 02:28:54 2009
@@ -1,5 +1,6 @@
To Do
=====
+new package for 1.99.3
separate verify program
separate from libcrypto?
64-bit offsets
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.9 src/crypto/external/bsd/netpgp/dist/configure:1.10
--- src/crypto/external/bsd/netpgp/dist/configure:1.9 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/configure Fri May 22 02:28:54 2009
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20090520.
+# Generated by GNU Autoconf 2.63 for netpgp 20090521.
#
# Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20090520'
-PACKAGE_STRING='netpgp 20090520'
+PACKAGE_VERSION='20090521'
+PACKAGE_STRING='netpgp 20090521'
PACKAGE_BUGREPORT='Alistair Crooks <a...@netbsd.org> c0596823'
ac_unique_file="src/bin/netpgp.c"
@@ -1268,7 +1268,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures netpgp 20090520 to adapt to many kinds of systems.
+\`configure' configures netpgp 20090521 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1338,7 +1338,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netpgp 20090520:";;
+ short | recursive ) echo "Configuration of netpgp 20090521:";;
esac
cat <<\_ACEOF
@@ -1418,7 +1418,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20090520
+netpgp configure 20090521
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1432,7 +1432,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by netpgp $as_me 20090520, which was
+It was created by netpgp $as_me 20090521, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -6161,7 +6161,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by netpgp $as_me 20090520, which was
+This file was extended by netpgp $as_me 20090521, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6220,7 +6220,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-netpgp config.status 20090520
+netpgp config.status 20090521
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Index: src/crypto/external/bsd/netpgp/dist/configure.ac
diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.9 src/crypto/external/bsd/netpgp/dist/configure.ac:1.10
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.9 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Fri May 22 02:28:54 2009
@@ -1,7 +1,7 @@
-dnl $Id: configure.ac,v 1.9 2009/05/21 00:33:31 agc Exp $
+dnl $Id: configure.ac,v 1.10 2009/05/22 02:28:54 agc Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([netpgp],[20090520],[Alistair Crooks <a...@netbsd.org> c0596823])
+AC_INIT([netpgp],[20090521],[Alistair Crooks <a...@netbsd.org> c0596823])
AC_CONFIG_SRCDIR([src/bin/netpgp.c])
AC_CONFIG_HEADER(src/lib/config.h)
AC_ARG_PROGRAM
Index: src/crypto/external/bsd/netpgp/dist/tst
diff -u src/crypto/external/bsd/netpgp/dist/tst:1.4 src/crypto/external/bsd/netpgp/dist/tst:1.5
--- src/crypto/external/bsd/netpgp/dist/tst:1.4 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/tst Fri May 22 02:28:54 2009
@@ -11,37 +11,37 @@
echo "======> sign/verify 180938 file"
cp configure a
/usr/bin/netpgp --sign a
-/usr/bin/netpgp --verify a.gpg && echo "[Verified OK]"
+/usr/bin/netpgp --verify a.gpg && echo "[Good verification]"
echo "======> attempt to verify an unsigned file"
-/usr/bin/netpgp --verify a && echo "[Verified OK]"
+/usr/bin/netpgp --verify a && echo "[Good verification]"
echo "======> encrypt/decrypt 10809 file"
cp src/bin/netpgp.1 b
/usr/bin/netpgp --encrypt b
/usr/bin/netpgp --decrypt b.gpg
-diff src/bin/netpgp.1 b && echo "[No differences found]"
+diff src/bin/netpgp.1 b && echo "[Good decryption]"
echo "======> encrypt/decrypt 180938 file"
cp configure c
/usr/bin/netpgp --encrypt c
/usr/bin/netpgp --decrypt c.gpg
-diff configure c && echo "[No differences found]"
+diff configure c && echo "[Good decryption]"
echo "======> encrypt/decrypt bigass file"
cat configure configure configure configure configure configure > d
ls -l d
cp d e
/usr/bin/netpgp --encrypt d
/usr/bin/netpgp --decrypt d.gpg
-diff e d && echo "[No differences found]"
+diff e d && echo "[Good decryption]"
echo "======> sign/verify detached signature file"
cat configure configure configure configure configure configure > f
/usr/bin/netpgp --sign --detached f
ls -l f f.sig
-/usr/bin/netpgp --verify f.sig && echo "[Verified OK]"
+/usr/bin/netpgp --verify f.sig && echo "[Good verification]"
echo "======> cat signature - verified cat command"
/usr/bin/netpgp --cat a.gpg > a2
-diff a a2 && echo "[No differences found]"
+diff a a2 && echo "[Good decryption]"
echo "======> another cat signature - verified cat command"
/usr/bin/netpgp --cat --output=a3 a.gpg
-diff a a3 && echo "[No differences found]"
+diff a a3 && echo "[Good verification]"
echo "======> version information"
/usr/bin/netpgp --version
rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig a2 a3
Index: src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.11 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.12
--- src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.11 Thu May 21 09:21:35 2009
+++ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1 Fri May 22 02:28:54 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.11 2009/05/21 09:21:35 wiz Exp $
+.\" $NetBSD: netpgp.1,v 1.12 2009/05/22 02:28:54 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 May 20, 2009
+.Dd May 21, 2009
.Dt NETPGP 1
.Os
.Sh NAME
@@ -36,10 +36,12 @@
.Sh SYNOPSIS
.Nm
.Fl Fl encrypt
+.Op Fl Fl output Ns = Ns Ar filename
.Op options
.Ar file ...
.Nm
.Fl Fl decrypt
+.Op Fl Fl output Ns = Ns Ar filename
.Op options
.Ar file ...
.Pp
@@ -48,6 +50,7 @@
.Op Fl Fl armor
.Op Fl Fl detach
.Op Fl Fl hash Ns = Ns Ar algorithm
+.Op Fl Fl output Ns = Ns Ar filename
.Op options
.Ar file ...
.Nm
@@ -61,6 +64,7 @@
.Ar file ...
.Nm
.Fl Fl clearsign
+.Op Fl Fl output Ns = Ns Ar filename
.Op options
.Ar file ...
.Pp
Index: src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.8 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.9
--- src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.8 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c Fri May 22 02:28:54 2009
@@ -218,20 +218,22 @@
case GENERATE_KEY:
return netpgp_generate_key(netpgp, p->userid, p->numbits);
case ENCRYPT:
- return netpgp_encrypt_file(netpgp, p->userid, f, NULL,
+ return netpgp_encrypt_file(netpgp, p->userid, f, p->output,
p->armour);
case DECRYPT:
- return netpgp_decrypt_file(netpgp, f, NULL, p->armour);
+ return netpgp_decrypt_file(netpgp, f, p->output, p->armour);
case SIGN:
- return netpgp_sign_file(netpgp, p->userid, f, NULL, p->armour,
- 0, p->detached);
+ return netpgp_sign_file(netpgp, p->userid, f, p->output,
+ p->armour, 0, p->detached);
case CLEARSIGN:
- return netpgp_sign_file(netpgp, p->userid, f, NULL, p->armour,
- 1, p->detached);
+ return netpgp_sign_file(netpgp, p->userid, f, p->output,
+ p->armour, 1, p->detached);
case VERIFY:
return netpgp_verify_file(netpgp, f, NULL, p->armour);
case VERIFY_CAT:
- return netpgp_verify_file(netpgp, f, p->output, p->armour);
+ return netpgp_verify_file(netpgp, f,
+ (p->output) ? p->output : "-",
+ p->armour);
case LIST_PACKETS:
return netpgp_list_packets(netpgp, f, p->armour, NULL);
case HELP_CMD:
@@ -274,7 +276,7 @@
p.progname = argv[0];
p.numbits = DEFAULT_NUMBITS;
p.overwrite = 1;
- p.output = strdup("-"); /* default --cat to stdout */
+ p.output = NULL;
if (argc < 2) {
print_usage(usage, p.progname);
exit(EXIT_ERROR);
@@ -381,7 +383,9 @@
"No output filename argument provided\n");
exit(EXIT_ERROR);
}
- (void) free(p.output);
+ if (p.output) {
+ (void) free(p.output);
+ }
p.output = strdup(optarg);
break;
Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.9 src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.10
--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h:1.9 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h Fri May 22 02:28:54 2009
@@ -122,13 +122,13 @@
#define PACKAGE_NAME "netpgp"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "netpgp 20090520"
+#define PACKAGE_STRING "netpgp 20090521"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "netpgp"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20090520"
+#define PACKAGE_VERSION "20090521"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.9 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.10
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.9 Thu May 21 00:33:32 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Fri May 22 02:28:54 2009
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "1.99.2"
+#define NETPGP_BASE_VERSION "1.99.3"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.8 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.9
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.8 Thu May 21 00:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet.h Fri May 22 02:28:54 2009
@@ -67,7 +67,7 @@
typedef struct {
size_t len;
unsigned char *contents;
- uint8_t mmapped; /* contents need an munmap(2) */
+ unsigned char mmapped; /* contents need an munmap(2) */
} __ops_data_t;
/************************************/
