[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib There were still som...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b83374383422
branches:  trunk
changeset: 758775:b83374383422
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Nov 15 08:56:30 2010 +0000

description:
There were still some throwbacks with the prefix '_ops' - rectify that to
be the standard "pgp_" - no functional change.

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/crypto.h       |  8 ++++----
 crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c |  4 ++--
 crypto/external/bsd/netpgp/dist/src/lib/packet.h       |  2 +-
 crypto/external/bsd/netpgp/dist/src/lib/types.h        |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 43150e7267bd -r b83374383422 crypto/external/bsd/netpgp/dist/src/lib/crypto.h
--- a/crypto/external/bsd/netpgp/dist/src/lib/crypto.h  Mon Nov 15 08:50:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/crypto.h  Mon Nov 15 08:56:30 2010 +0000
@@ -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;
diff -r 43150e7267bd -r b83374383422 crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c    Mon Nov 15 08:50:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c    Mon Nov 15 08:56:30 2010 +0000
@@ -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;
diff -r 43150e7267bd -r b83374383422 crypto/external/bsd/netpgp/dist/src/lib/packet.h
--- a/crypto/external/bsd/netpgp/dist/src/lib/packet.h  Mon Nov 15 08:50:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/packet.h  Mon Nov 15 08:56:30 2010 +0000
@@ -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;
diff -r 43150e7267bd -r b83374383422 crypto/external/bsd/netpgp/dist/src/lib/types.h
--- a/crypto/external/bsd/netpgp/dist/src/lib/types.h   Mon Nov 15 08:50:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/types.h   Mon Nov 15 08:56:30 2010 +0000
@@ -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;