Module Name: src
Committed By: agc
Date: Thu Jun 11 17:05:18 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac
src/crypto/external/bsd/netpgp/dist/src/lib: version.h
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: verify.c
Log Message:
Update to version 1.99.12
CHANGES 1.99.11 -> 1.99.12
+ only prompt for the passphrase for the secret key if the secret key is
protected by a passphrase
+ portability fix for Mac OS X
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.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/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.20 src/crypto/external/bsd/netpgp/dist/TODO:1.21
--- src/crypto/external/bsd/netpgp/dist/TODO:1.20 Thu Jun 11 04:57:51 2009
+++ src/crypto/external/bsd/netpgp/dist/TODO Thu Jun 11 17:05:17 2009
@@ -1,7 +1,6 @@
To Do
=====
-read input via fd's, per ver
-write output to fd's, per ver
+return userids from successful verify, and then print id out if required
error logging
separate from libcrypto?
64-bit offsets
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.18 src/crypto/external/bsd/netpgp/dist/configure:1.19
--- src/crypto/external/bsd/netpgp/dist/configure:1.18 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/configure Thu Jun 11 17:05:17 2009
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.16 .
+# From configure.ac Revision: 1.17 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for netpgp 20090608.
+# Generated by GNU Autoconf 2.63 for netpgp 20090611.
#
# Report bugs to <Alistair Crooks <a...@netbsd.org> c0596823>.
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
-PACKAGE_VERSION='20090608'
-PACKAGE_STRING='netpgp 20090608'
+PACKAGE_VERSION='20090611'
+PACKAGE_STRING='netpgp 20090611'
PACKAGE_BUGREPORT='Alistair Crooks <a...@netbsd.org> c0596823'
ac_unique_file="src/netpgp/netpgp.c"
@@ -1483,7 +1483,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 20090608 to adapt to many kinds of systems.
+\`configure' configures netpgp 20090611 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,7 +1553,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netpgp 20090608:";;
+ short | recursive ) echo "Configuration of netpgp 20090611:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netpgp configure 20090608
+netpgp configure 20090611
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1674,7 +1674,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 20090608, which was
+It was created by netpgp $as_me 20090611, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2561,7 +2561,7 @@
# Define the identity of the package.
PACKAGE='netpgp'
- VERSION='20090608'
+ VERSION='20090611'
cat >>confdefs.h <<_ACEOF
@@ -22306,7 +22306,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 20090608, which was
+This file was extended by netpgp $as_me 20090611, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22369,7 +22369,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-netpgp config.status 20090608
+netpgp config.status 20090611
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.17 src/crypto/external/bsd/netpgp/dist/configure.ac:1.18
--- src/crypto/external/bsd/netpgp/dist/configure.ac:1.17 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/configure.ac Thu Jun 11 17:05:17 2009
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.17 2009/06/10 00:38:09 agc Exp $
+# $NetBSD: configure.ac,v 1.18 2009/06/11 17:05:17 agc Exp $
#
# Process this file with autoconf to produce a configure script.
-AC_INIT([netpgp],[20090608],[Alistair Crooks <a...@netbsd.org> c0596823])
+AC_INIT([netpgp],[20090611],[Alistair Crooks <a...@netbsd.org> c0596823])
AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.17 $])
+AC_REVISION([$Revision: 1.18 $])
AS_SHELL_SANITIZE
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.18 Thu Jun 11 01:12:42 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Thu Jun 11 17:05:18 2009
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "1.99.11"
+#define NETPGP_BASE_VERSION "1.99.12"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.1 Tue Jun 9 00:51:03 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Thu Jun 11 17:05:18 2009
@@ -55,7 +55,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: verify.c,v 1.1 2009/06/09 00:51:03 agc Exp $");
+__RCSID("$NetBSD: verify.c,v 1.2 2009/06/11 17:05:18 agc Exp $");
#endif
#include <sys/types.h>
@@ -1357,7 +1357,7 @@
size_t blocksize;
size_t keysize;
void (*set_iv)(struct __ops_crypt_t *, const uint8_t *);
- void (*set_key)(struct __ops_crypt_t *, const uint8_t *);
+ void (*set_crypt_key)(struct __ops_crypt_t *, const uint8_t *);
void (*base_init)(struct __ops_crypt_t *);
void (*decrypt_resync)(struct __ops_crypt_t *);
/* encrypt/decrypt one block */
@@ -7054,7 +7054,7 @@
__ops_crypt_any(&decrypt, pkt.u.seckey.alg);
decrypt.set_iv(&decrypt, pkt.u.seckey.iv);
- decrypt.set_key(&decrypt, key);
+ decrypt.set_crypt_key(&decrypt, key);
/* now read encrypted data */
@@ -7374,7 +7374,7 @@
__ops_crypt_any(&stream->decrypt, pkt.u.pk_sesskey.symm_alg);
iv = __ops_new(stream->decrypt.blocksize);
stream->decrypt.set_iv(&stream->decrypt, iv);
- stream->decrypt.set_key(&stream->decrypt, pkt.u.pk_sesskey.key);
+ stream->decrypt.set_crypt_key(&stream->decrypt, pkt.u.pk_sesskey.key);
__ops_encrypt_init(&stream->decrypt);
(void) free(iv);
return 1;
