Module Name: src
Committed By: agc
Date: Mon Nov 15 08:56:30 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: crypto.h packet-parse.c
packet.h types.h
Log Message:
There were still some throwbacks with the prefix '_ops' - rectify that to
be the standard "pgp_" - no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h
cvs rdiff -u -r1.49 -r1.50 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/lib/types.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/src/lib/crypto.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.28 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.29
--- src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h:1.28 Thu Nov 11 00:58:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h Mon Nov 15 08:56:30 2010
@@ -62,8 +62,8 @@
#define PGP_MIN_HASH_SIZE 16
-/** _ops_hash_t */
-struct _ops_hash_t {
+/** pgp_hash_t */
+struct pgp_hash_t {
pgp_hash_alg_t alg; /* algorithm */
size_t size; /* size */
const char *name; /* what it's known as */
@@ -73,8 +73,8 @@
void *data; /* blob for data */
};
-/** _ops_crypt_t */
-struct _ops_crypt_t {
+/** pgp_crypt_t */
+struct pgp_crypt_t {
pgp_symm_alg_t alg;
size_t blocksize;
size_t keysize;
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.49 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.50
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.49 Mon Nov 15 08:50:32 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Mon Nov 15 08:56:30 2010
@@ -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.49 2010/11/15 08:50:32 agc Exp $");
+__RCSID("$NetBSD: packet-parse.c,v 1.50 2010/11/15 08:56:30 agc Exp $");
#endif
#include <sys/types.h>
@@ -888,7 +888,7 @@
\brief Free allocated memory
*/
static void
-cleartext_trailer_free(struct _ops_hash_t **trailer)
+cleartext_trailer_free(struct pgp_hash_t **trailer)
{
free(*trailer);
*trailer = NULL;
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.29 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.30
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet.h:1.29 Thu Nov 11 00:58:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet.h Mon Nov 15 08:56:30 2010
@@ -855,7 +855,7 @@
const char *armour_trailer;
pgp_headers_t cleartext_head;
pgp_fixed_body_t cleartext_body;
- struct _ops_hash_t *cleartext_trailer;
+ struct pgp_hash_t *cleartext_trailer;
pgp_dyn_body_t unarmoured_text;
pgp_pk_sesskey_t pk_sesskey;
pgp_seckey_passphrase_t skey_passphrase;
Index: src/crypto/external/bsd/netpgp/dist/src/lib/types.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.10 src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.11
--- src/crypto/external/bsd/netpgp/dist/src/lib/types.h:1.10 Sun Nov 7 08:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/types.h Mon Nov 15 08:56:30 2010
@@ -69,10 +69,10 @@
/** pgp_errcode_name_map_t */
typedef pgp_map_t pgp_errcode_name_map_t;
-typedef struct _ops_crypt_t pgp_crypt_t;
+typedef struct pgp_crypt_t pgp_crypt_t;
/** pgp_hash_t */
-typedef struct _ops_hash_t pgp_hash_t;
+typedef struct pgp_hash_t pgp_hash_t;
/** Revocation Reason type */
typedef uint8_t pgp_ss_rr_code_t;
