Module Name: src
Committed By: agc
Date: Thu Jun 11 01:12:43 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO
src/crypto/external/bsd/netpgp/dist/src/lib: create.c keyring.c misc.c
netpgp.c netpgpdefs.h openssl_crypto.c packet-parse.c
packet-parse.h packet-show.c packet.h reader.c signature.c
validate.c version.h
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-show-cast.h
Log Message:
CHANGES 1.99.10 -> 1.99.11
+ address keys array from 0 with unsigned indices
+ print results to io->res stream - default to stderr, and set using
netpgp_setvar(..., "results", filename)
+ __ops_keyid()'s third arg was always the size of the keyid array - no need
to pass it
+ get rid of the excessive type-checking in packet-show-cast.h, which wasn't
necessary, and fold all the show routines into packet-show.c
+ introduce a generic __ops_new() and use it for some structure allocation
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/dist/src/lib/create.c \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
cvs rdiff -u -r1.23 -r1.24 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h
cvs rdiff -u -r1.5 -r0 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-show-cast.h
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
cvs rdiff -u -r1.2 -r1.3 \
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/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.17 src/crypto/external/bsd/netpgp/dist/TODO:1.18
--- src/crypto/external/bsd/netpgp/dist/TODO:1.17 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/TODO Thu Jun 11 01:12:42 2009
@@ -1,5 +1,7 @@
To Do
=====
+read input via fd's, per ver
+write output to fd's, per ver
error logging
separate from libcrypto?
64-bit offsets
Index: src/crypto/external/bsd/netpgp/dist/src/lib/create.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.17 Tue Jun 9 00:51:01 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/create.c Thu Jun 11 01:12:42 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: create.c,v 1.17 2009/06/09 00:51:01 agc Exp $");
+__RCSID("$NetBSD: create.c,v 1.18 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -1272,7 +1272,7 @@
{
unsigned char keyid[OPS_KEY_ID_SIZE];
- __ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE, &seckey->pubkey);
+ __ops_keyid(keyid, OPS_KEY_ID_SIZE, &seckey->pubkey);
return __ops_write_ptag(output, OPS_PTAG_CT_1_PASS_SIG) &&
__ops_write_length(output, 1 + 1 + 1 + 1 + 8 + 1) &&
__ops_write_scalar(output, 3, 1) /* version */ &&
Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.17 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.18
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.17 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h Thu Jun 11 01:12:42 2009
@@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION "1.99.10"
+#define NETPGP_BASE_VERSION "1.99.11"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \
Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.18 Wed Jun 10 16:01:37 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Thu Jun 11 01:12:42 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.18 2009/06/10 16:01:37 agc Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.19 2009/06/11 01:12:42 agc Exp $");
#endif
#ifdef HAVE_FCNTL_H
@@ -300,7 +300,7 @@
(void) memset(&decrypt, 0x0, sizeof(decrypt));
decrypt.key = key;
decrypt.passphrase = strdup(passphrase);
- stream = __ops_parseinfo_new();
+ stream = __ops_new(sizeof(*stream));
__ops_keydata_reader_set(stream, key);
__ops_set_callback(stream, decrypt_cb, &decrypt);
stream->readinfo.accumulate = 1;
@@ -627,7 +627,7 @@
unsigned res = 1;
int fd;
- stream = __ops_parseinfo_new();
+ stream = __ops_new(sizeof(*stream));
/* add this for the moment, */
/*
@@ -644,7 +644,7 @@
fd = open(filename, O_RDONLY);
#endif
if (fd < 0) {
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
perror(filename);
return 0;
}
@@ -664,14 +664,14 @@
} else {
res = 1;
}
- __ops_print_errors(__ops_parseinfo_get_errors(stream));
+ __ops_print_errors(__ops_stream_get_errors(stream));
if (armour)
__ops_reader_pop_dearmour(stream);
close(fd);
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
return res;
}
@@ -709,7 +709,7 @@
const unsigned noaccum = 0;
unsigned res = 1;
- stream = __ops_parseinfo_new();
+ stream = __ops_new(sizeof(*stream));
__ops_parse_options(stream, OPS_PTAG_SS_ALL, OPS_PARSE_PARSED);
__ops_setup_memory_read(io, &stream, mem, NULL, cb_keyring_read,
noaccum);
@@ -717,12 +717,12 @@
__ops_reader_push_dearmour(stream);
}
res = __ops_parse_and_accumulate(keyring, stream);
- __ops_print_errors(__ops_parseinfo_get_errors(stream));
+ __ops_print_errors(__ops_stream_get_errors(stream));
if (armour) {
__ops_reader_pop_dearmour(stream);
}
/* don't call teardown_memory_read because memory was passed in */
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
return res;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.18 Sun May 31 23:26:20 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c Thu Jun 11 01:12:42 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: signature.c,v 1.18 2009/05/31 23:26:20 agc Exp $");
+__RCSID("$NetBSD: signature.c,v 1.19 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -1011,7 +1011,7 @@
return 0;
}
- __ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE, &seckey->pubkey);
+ __ops_keyid(keyid, OPS_KEY_ID_SIZE, &seckey->pubkey);
ret = __ops_add_issuer_keyid(sig, keyid) &&
__ops_end_hashed_subpkts(sig) &&
__ops_write_sig(output, sig, &seckey->pubkey, seckey);
@@ -1091,7 +1091,7 @@
if (ret == 0) {
return 0;
}
- __ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE, &seckey->pubkey);
+ __ops_keyid(keyid, OPS_KEY_ID_SIZE, &seckey->pubkey);
ret = __ops_add_issuer_keyid(sig, keyid) &&
__ops_end_hashed_subpkts(sig) &&
@@ -1188,7 +1188,7 @@
/* add creation time to signature */
__ops_add_birthtime(sig, time(NULL));
/* add key id to signature */
- __ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE, &seckey->pubkey);
+ __ops_keyid(keyid, OPS_KEY_ID_SIZE, &seckey->pubkey);
__ops_add_issuer_keyid(sig, keyid);
__ops_end_hashed_subpkts(sig);
@@ -1269,7 +1269,7 @@
/* add creation time to signature */
__ops_add_birthtime(sig, time(NULL));
/* add key id to signature */
- __ops_keyid(keyid, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE, &seckey->pubkey);
+ __ops_keyid(keyid, OPS_KEY_ID_SIZE, &seckey->pubkey);
__ops_add_issuer_keyid(sig, keyid);
__ops_end_hashed_subpkts(sig);
@@ -1322,7 +1322,7 @@
/* calculate the signature */
t = time(NULL);
__ops_add_birthtime(sig, t);
- __ops_keyid(keyid, sizeof(keyid), sizeof(keyid), &seckey->pubkey);
+ __ops_keyid(keyid, sizeof(keyid), &seckey->pubkey);
__ops_add_issuer_keyid(sig, keyid);
__ops_end_hashed_subpkts(sig);
Index: src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.18 src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.19
--- src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.18 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Thu Jun 11 01:12:42 2009
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: validate.c,v 1.18 2009/06/09 00:51:02 agc Exp $");
+__RCSID("$NetBSD: validate.c,v 1.19 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -554,7 +554,7 @@
keysigs.result = result;
keysigs.getpassphrase = cb_get_passphrase;
- stream = __ops_parseinfo_new();
+ stream = __ops_new(sizeof(*stream));
/* __ops_parse_options(&opt,OPS_PTAG_CT_SIGNATURE,OPS_PARSE_PARSED); */
keysigs.keyring = keyring;
@@ -576,7 +576,7 @@
__ops_userid_free(&keysigs.userid);
__ops_userattr_free(&keysigs.userattr);
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
return (!result->invalidc && !result->unknownc && result->validc);
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.19 Wed Jun 10 16:01:37 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Thu Jun 11 01:12:42 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: misc.c,v 1.19 2009/06/10 16:01:37 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.20 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -120,7 +120,7 @@
case OPS_PTAG_CT_ENCRYPTED_SECRET_KEY:
if (__ops_get_debug_level(__FILE__)) {
(void) fprintf(stderr, "Creating key %d - tag %d\n",
- keyring->keyc + 1, pkt->tag);
+ keyring->keyc, pkt->tag);
}
EXPAND_ARRAY(keyring, key);
pubkey = (pkt->tag == OPS_PTAG_CT_PUBLIC_KEY) ?
@@ -128,8 +128,7 @@
&content->seckey.pubkey;
key = &keyring->keys[keyring->keyc++];
(void) memset(key, 0x0, sizeof(*key));
- __ops_keyid(key->key_id, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE,
- pubkey);
+ __ops_keyid(key->key_id, OPS_KEY_ID_SIZE, pubkey);
__ops_fingerprint(&key->fingerprint, pubkey);
key->type = pkt->tag;
if (pkt->tag == OPS_PTAG_CT_PUBLIC_KEY) {
@@ -138,7 +137,6 @@
key->key.seckey = content->seckey;
}
return OPS_KEEP_MEMORY;
-
case OPS_PTAG_CT_USER_ID:
if (__ops_get_debug_level(__FILE__)) {
(void) fprintf(stderr, "User ID: %s for key %d\n",
@@ -281,6 +279,19 @@
(__ops_map_t *) errcode_name_map));
}
+/* generic grab new storage function */
+void *
+__ops_new(size_t size)
+{
+ void *vp;
+
+ if ((vp = calloc(1, size)) == NULL) {
+ (void) fprintf(stderr,
+ "allocation failure for %" PRIsize "u bytes", size);
+ }
+ return vp;
+}
+
/**
* \ingroup Core_Errors
* \brief Pushes the given error on the given errorstack
@@ -481,8 +492,7 @@
*/
void
-__ops_keyid(unsigned char *keyid, const size_t idlen, const int last,
- const __ops_pubkey_t *key)
+__ops_keyid(unsigned char *keyid, const size_t idlen, const __ops_pubkey_t *key)
{
if (key->version == 2 || key->version == 3) {
unsigned char bn[NETPGP_BUFSIZ];
@@ -499,15 +509,14 @@
return;
}
BN_bn2bin(key->key.rsa.n, bn);
- (void) memcpy(keyid, (last == 0) ? bn : bn + n - idlen, idlen);
+ (void) memcpy(keyid, bn + n - idlen, idlen);
} else {
__ops_fingerprint_t finger;
__ops_fingerprint(&finger, key);
(void) memcpy(keyid,
- (last == 0) ? finger.fingerprint :
finger.fingerprint + finger.length - idlen,
- idlen);
+ idlen);
}
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.19 Tue Jun 9 02:19:47 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Thu Jun 11 01:12:42 2009
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.19 2009/06/09 02:19:47 agc Exp $");
+__RCSID("$NetBSD: reader.c,v 1.20 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -1884,7 +1884,7 @@
__ops_cbdata_t *),
unsigned accumulate)
{
- *stream = __ops_parseinfo_new();
+ *stream = __ops_new(sizeof(**stream));
(*stream)->io = (*stream)->cbinfo.io = io;
__ops_set_callback(*stream, callback, vp);
__ops_reader_set_memory(*stream,
@@ -1905,7 +1905,7 @@
void
__ops_teardown_memory_read(__ops_stream_t *stream, __ops_memory_t *mem)
{
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
__ops_memory_free(mem);
}
@@ -2035,7 +2035,7 @@
(void) fprintf(io->errs, "can't open \"%s\"\n", filename);
return fd;
}
- *stream = __ops_parseinfo_new();
+ *stream = __ops_new(sizeof(**stream));
(*stream)->io = (*stream)->cbinfo.io = io;
__ops_set_callback(*stream, callback, vp);
#ifdef USE_MMAP_FOR_FILES
@@ -2060,7 +2060,7 @@
__ops_teardown_file_read(__ops_stream_t *stream, int fd)
{
close(fd);
- __ops_parseinfo_delete(stream);
+ __ops_stream_delete(stream);
}
__ops_cb_ret_t
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.23 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.24
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.23 Wed Jun 10 16:36:23 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu Jun 11 01:12:42 2009
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.23 2009/06/10 16:36:23 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.24 2009/06/11 01:12:42 agc Exp $");
#endif
#include <sys/types.h>
@@ -150,7 +150,7 @@
char id[MAX_ID_LENGTH + 1];
for (i = 0; i < res->validc; i++) {
- (void) fprintf(io->errs,
+ (void) fprintf(io->res,
"Good signature for %s made %susing %s key %s\n",
f,
ctime(&res->valid_sigs[i].birthtime),
@@ -558,7 +558,7 @@
int
netpgp_verify_file(netpgp_t *netpgp, const char *in, const char *out, int armored)
{
- __ops_validation_t result;
+ __ops_validation_t result;
__ops_io_t *io;
(void) memset(&result, 0x0, sizeof(result));
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h:1.6 src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h:1.7
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h:1.6 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgpdefs.h Thu Jun 11 01:12:42 2009
@@ -44,16 +44,6 @@
#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
#endif
-/*
- * These macros code ensures that you are casting what you intend to cast.
- * It works because in "a ? b : c", b and c must have the same type.
- * This is a copy of the macro defined in openssl/asn1.h.
- */
-#ifndef CHECKED_PTR_OF
-#define CHECKED_PTR_OF(type, p) ((void*) (/*CONSTCOND*/1 ? p : (type *)0))
-#endif
-#define CHECKED_INSTANCE_OF(type, p) (/*CONSTCOND*/1 ? p : (type)0)
-
/* number of elements in an array */
#define OPS_ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
@@ -64,6 +54,8 @@
int __ops_set_debug_level(const char *);
int __ops_get_debug_level(const char *);
+void *__ops_new(size_t);
+
#define NETPGP_BUFSIZ 8192
#define CALLBACK(t, cbinfo, pkt) do { \
Index: src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.14 src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.15
--- src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c:1.14 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c Thu Jun 11 01:12:42 2009
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: openssl_crypto.c,v 1.14 2009/06/09 00:51:02 agc Exp $");
+__RCSID("$NetBSD: openssl_crypto.c,v 1.15 2009/06/11 01:12:42 agc Exp $");
#endif
#ifdef HAVE_OPENSSL_DSA_H
@@ -815,7 +815,7 @@
RSA_free(rsa);
- __ops_keyid(keydata->key_id, OPS_KEY_ID_SIZE, OPS_KEY_ID_SIZE,
+ __ops_keyid(keydata->key_id, OPS_KEY_ID_SIZE,
&keydata->key.seckey.pubkey);
__ops_fingerprint(&keydata->fingerprint, &keydata->key.seckey.pubkey);
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.20 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.21
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.20 Tue Jun 9 19:32:11 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Thu Jun 11 01:12:42 2009
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-parse.c,v 1.20 2009/06/09 19:32:11 agc Exp $");
+__RCSID("$NetBSD: packet-parse.c,v 1.21 2009/06/11 01:12:42 agc Exp $");
#endif
#ifdef HAVE_OPENSSL_CAST_H
@@ -3374,22 +3374,10 @@
/**
\ingroup Core_ReadPackets
-\brief Creates a new zero-ed __ops_stream_t struct
-\sa __ops_parseinfo_delete()
-*/
-__ops_stream_t *
-__ops_parseinfo_new(void)
-{
- return calloc(1, sizeof(__ops_stream_t));
-}
-
-/**
-\ingroup Core_ReadPackets
\brief Free __ops_stream_t struct and its contents
-\sa __ops_parseinfo_new()
*/
void
-__ops_parseinfo_delete(__ops_stream_t *stream)
+__ops_stream_delete(__ops_stream_t *stream)
{
__ops_cbdata_t *cbinfo;
__ops_cbdata_t *next;
@@ -3498,7 +3486,7 @@
\return parse_info's errors
*/
__ops_error_t *
-__ops_parseinfo_get_errors(__ops_stream_t *stream)
+__ops_stream_get_errors(__ops_stream_t *stream)
{
return stream->errors;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h:1.9 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h:1.10
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h:1.9 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h Thu Jun 11 01:12:42 2009
@@ -112,9 +112,8 @@
typedef void __ops_reader_destroyer_t(__ops_reader_t *);
-__ops_stream_t *__ops_parseinfo_new(void);
-void __ops_parseinfo_delete(__ops_stream_t *);
-__ops_error_t *__ops_parseinfo_get_errors(__ops_stream_t *);
+void __ops_stream_delete(__ops_stream_t *);
+__ops_error_t *__ops_stream_get_errors(__ops_stream_t *);
__ops_crypt_t *__ops_get_decrypt(__ops_stream_t *);
void __ops_set_callback(__ops_stream_t *, __ops_cbfunc_t *, void *);
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.11 src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.12
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.11 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c Thu Jun 11 01:12:42 2009
@@ -60,7 +60,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-show.c,v 1.11 2009/06/09 00:51:02 agc Exp $");
+__RCSID("$NetBSD: packet-show.c,v 1.12 2009/06/11 01:12:42 agc Exp $");
#endif
#include <stdlib.h>
@@ -311,8 +311,6 @@
{0x00, NULL},
};
-#include "packet-show-cast.h"
-
/*
* Private functions
*/
@@ -588,11 +586,10 @@
{
const char *ret;
- ret = show_packet_tag(packet_tag, packet_tag_map);
+ ret = __ops_str_from_map(packet_tag, packet_tag_map);
if (!ret) {
ret = "Unknown Tag";
}
-
return ret;
}
@@ -606,7 +603,7 @@
const char *
__ops_show_ss_type(__ops_ss_type_t ss_type)
{
- return show_ss_type(ss_type, ss_type_map);
+ return __ops_str_from_map(ss_type, ss_type_map);
}
/**
@@ -619,7 +616,7 @@
const char *
__ops_show_ss_rr_code(__ops_ss_rr_code_t ss_rr_code)
{
- return show_ss_rr_code(ss_rr_code, ss_rr_code_map);
+ return __ops_str_from_map(ss_rr_code, ss_rr_code_map);
}
/**
@@ -632,7 +629,7 @@
const char *
__ops_show_sig_type(__ops_sig_type_t sig_type)
{
- return show_sig_type(sig_type, sig_type_map);
+ return __ops_str_from_map(sig_type, sig_type_map);
}
/**
@@ -645,7 +642,7 @@
const char *
__ops_show_pka(__ops_pubkey_alg_t pka)
{
- return show_pka(pka, pubkey_alg_map);
+ return __ops_str_from_map(pka, pubkey_alg_map);
}
/**
@@ -686,7 +683,7 @@
const char *
__ops_show_hash_alg(unsigned char hash)
{
- return show_hash_alg(hash);
+ return __ops_str_from_map(hash, hash_alg_map);
}
/**
@@ -707,7 +704,7 @@
const char *
__ops_show_symm_alg(unsigned char hash)
{
- return show_symm_alg(hash);
+ return __ops_str_from_map(hash, symm_alg_map);
}
/**
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.13 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.14
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.13 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet.h Thu Jun 11 01:12:42 2009
@@ -1035,8 +1035,7 @@
void __ops_init(void);
void __ops_finish(void);
-void __ops_keyid(unsigned char *, const size_t, const int,
- const __ops_pubkey_t *);
+void __ops_keyid(unsigned char *, const size_t, const __ops_pubkey_t *);
void __ops_fingerprint(__ops_fingerprint_t *, const __ops_pubkey_t *);
void __ops_pubkey_free(__ops_pubkey_t *);
void __ops_userid_free(__ops_userid_t *);
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.2 Wed Jun 10 00:38:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Thu Jun 11 01:12:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.2 2009/06/10 00:38:09 agc Exp $
+.\" $NetBSD: netpgp.1,v 1.3 2009/06/11 01:12:42 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 9, 2009
+.Dd June 10, 2009
.Dt NETPGP 1
.Os
.Sh NAME
@@ -85,6 +85,8 @@
.br
.Op Fl Fl keyring Ns = Ns Ar keyring
.br
+.Op Fl Fl results Ns = Ns Ar filename
+.br
.Op Fl Fl userid Ns = Ns Ar userid
.br
.Op Fl Fl verbose
@@ -223,6 +225,10 @@
and this may also be specified using the
.Dq -
value.
+.It Fl Fl results Ar filename
+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 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
