--- pgp/src/pgp.h	2018/04/24 16:39:54	1.1.1.4
+++ pgp/src/pgp.h	2018/04/24 16:44:25	1.1.1.8
@@ -9,6 +9,9 @@
 
 */
 
+#ifndef PGP_H
+#define PGP_H
+
 #include "usuals.h"
 #include "more.h"
 #include "armor.h"
@@ -48,7 +51,8 @@
 #define is_ctb_type(ctb,type) (((ctb) & CTB_TYPE_MASK)==(4*type))
 #define CTB_BYTE(type,llen) (CTB_DESIGNATOR + (4*type) + llen)
 
-#define CTB_PKE_TYPE 1			/* packet encrypted with RSA public key */
+#define CTB_PKE_TYPE 1			/* packet encrypted with RSA public
+					   key */
 #define CTB_SKE_TYPE 2			/* packet signed with RSA secret key */
 #define CTB_MD_TYPE 3			/* message digest packet */
 #define CTB_CERT_SECKEY_TYPE 5  /* secret key certificate */
@@ -73,7 +77,8 @@
 #define CTB_MD CTB_BYTE(CTB_MD_TYPE,0)
 	/* CTB_MD len8 algorithm MD timestamp */
 #define CTB_CERT_SECKEY CTB_BYTE(CTB_CERT_SECKEY_TYPE,1)
-	/* CTB_CERT_SECKEY len16 timestamp userID mpi(n) mpi(e) mpi(d) mpi(p) mpi(q) mpi(u) crc16 */
+	/* CTB_CERT_SECKEY len16 timestamp userID mpi(n) mpi(e) mpi(d)
+	   mpi(p) mpi(q) mpi(u) crc16 */
 #define CTB_CERT_PUBKEY CTB_BYTE(CTB_CERT_PUBKEY_TYPE,1)
 	/* CTB_CERT_PUBKEY len16 timestamp userID mpi(n) mpi(e) crc16 */
 
@@ -111,47 +116,48 @@
 #define	K3_SIGNATURE_BYTE	0x13	/* Key certification, positive ID */
 #define KC_SIGNATURE_BYTE	0x20	/* Key compromise */
 #define KR_SIGNATURE_BYTE	0x30	/* Key revocation */
-#define	TS_SIGNATURE_BYTE	0x40	/* Timestamp someone else's signature */
+#define	TS_SIGNATURE_BYTE	0x40	/* Timestamp someone else's
+					   signature */
 
 /* Public key encrypted data classification bytes. */
 #define MD_ENCRYPTED_BYTE	1	/* Message digest is encrypted */
 #define CK_ENCRYPTED_BYTE	2	/* Conventional key is encrypted */
 
 /* Version byte for data structures created by this version of PGP */
-#define	VERSION_BYTE		2	/* PGP2 */
+#define	VERSION_BYTE_OLD	2	/* PGP2 */
+#define	VERSION_BYTE_NEW	3
 
 /* Values for trust bits in keycntrl packet after key packet */
-#define	KC_OWNERTRUST_MASK		0x07	/* Trust bits for key owner */
+#define	KC_OWNERTRUST_MASK	0x07	/* Trust bits for key owner */
 #define	KC_OWNERTRUST_UNDEFINED	0x00
 #define	KC_OWNERTRUST_UNKNOWN	0x01
-#define	KC_OWNERTRUST_NEVER		0x02
+#define	KC_OWNERTRUST_NEVER	0x02
 /* 2 levels reserved */
 #define	KC_OWNERTRUST_USUALLY	0x05
 #define	KC_OWNERTRUST_ALWAYS	0x06
 #define	KC_OWNERTRUST_ULTIMATE	0x07	/* Only for keys in secret ring */
-#define	KC_BUCKSTOP				0x80	/* This key is in secret ring */
-#define	KC_VISITED				0x40
-#define	KC_DISABLED				0x20	/* key is disabled */
+#define	KC_BUCKSTOP		0x80	/* This key is in secret ring */
+#define	KC_DISABLED		0x20	/* key is disabled */
 
 /* Values for trust bits in keycntrl packet after userid packet */
-#define	KC_LEGIT_MASK			0x03	/* Key legit bits for key */
-#define	KC_LEGIT_UNKNOWN		0x00
-#define KC_LEGIT_UNTRUSTED		0x01
-#define KC_LEGIT_MARGINAL		0x02
-#define	KC_LEGIT_COMPLETE		0x03
-#define	KC_WARNONLY				0x80
+#define	KC_LEGIT_MASK		0x03	/* Key legit bits for key */
+#define	KC_LEGIT_UNKNOWN	0x00
+#define KC_LEGIT_UNTRUSTED	0x01
+#define KC_LEGIT_MARGINAL	0x02
+#define	KC_LEGIT_COMPLETE	0x03
+#define	KC_WARNONLY		0x80
 
 /* Values for trust bits in keycntrl packet after signature packet */
-#define	KC_SIGTRUST_MASK		0x07	/* Trust bits for key owner */
+#define	KC_SIGTRUST_MASK	0x07	/* Trust bits for key owner */
 #define	KC_SIGTRUST_UNDEFINED	0x00
-#define	KC_SIGTRUST_UNKNOWN		0x01
+#define	KC_SIGTRUST_UNKNOWN	0x01
 #define	KC_SIGTRUST_UNTRUSTED	0x02
 /* 2 levels reserved */
 #define	KC_SIGTRUST_MARGINAL	0x05
 #define	KC_SIGTRUST_COMPLETE	0x06
 #define	KC_SIGTRUST_ULTIMATE	0x07
-#define	KC_SIG_CHECKED			0x40	/* This sig has been checked */
-#define	KC_CONTIG				0x80	/* This sig is on a cert. path */
+#define	KC_SIG_CHECKED		0x40	/* This sig has been checked */
+#define	KC_CONTIG		0x80	/* This sig is on a cert. path */
 
 #define is_secret_key(ctb) is_ctb_type(ctb,CTB_CERT_SECKEY_TYPE)
 
@@ -164,12 +170,6 @@
 #define	MODE_TEXT	't'
 #define MODE_LOCAL	'l'
 
-/* Define CANONICAL_TEXT for any system which normally uses CRLF's
-   for text separators */
-#ifdef MSDOS
-#define	CANONICAL_TEXT
-#endif /* MSDOS */
-
 /* Prototype for the 'more' function, which blorts a file to the screen with
    page breaks, intelligent handling of line terminators, truncation of
    overly long lines, and zapping of illegal chars.  Implemented in MORE.C */
@@ -193,9 +193,10 @@ extern char CONSOLE_FILENAME[];
 extern char rel_version[];
 
 /* These files use the environmental variable PGPPATH as a default path: */
-extern char PUBLIC_KEYRING_FILENAME[32];
-extern char SECRET_KEYRING_FILENAME[32];
-extern char RANDSEED_FILENAME[32];
+extern char globalPubringName[MAX_PATH];
+extern char globalSecringName[MAX_PATH];
+extern char globalRandseedName[MAX_PATH];
+extern char globalCommentString[128];
 
 /* Variables which are global across the driver code */
 extern boolean	filter_mode;
@@ -203,7 +204,8 @@ extern boolean	moreflag;
 extern FILE	*pgpout;	/* FILE structure for routine output */
 
 /* Variables settable by config.pgp and referenced in config.c ... */
-extern char language[];	/* foreign language prefix code for language.pgp file */
+extern char language[];	/* foreign language prefix code for language.pgp
+			   file */
 extern char charset[];
 /* my_name is substring of default userid for secret key to make signatures */
 extern char my_name[];
@@ -213,13 +215,12 @@ extern boolean emit_radix_64;
 extern boolean showpass;
 extern boolean keepctx;
 extern boolean verbose;	/* display maximum information */
-extern boolean compress_enabled;	/* attempt compression before encryption */
+extern boolean compress_enabled; /* attempt compression before encryption */
 extern boolean clear_signatures;
 extern boolean encrypt_to_self; /* Should I encrypt to myself? */
 extern boolean batchmode;	/* for batch processing */
 extern boolean quietmode;	/* less verbose */
 extern boolean force_flag;	/* overwrite existing file without asking */
-extern boolean pkcs_compat;	/* Use PKCS format messages */
 /* Ask for each key separately if it should be added to the keyring */
 extern boolean interactive_add;
 extern long timeshift;	/* seconds from GMT timezone */
@@ -230,6 +231,9 @@ extern int marg_min;	/* number of margin
 extern int compl_min;	/* number of fully trusted signatures needed */
 extern int max_cert_depth;
 extern char pager[];	/* file lister command */
+extern int version_byte;
+extern boolean nomanual;
+extern int makerandom;	/* Fill in file with this many random bytes */
 
 /* These lists store hashed passwords for future use. */
 /* passwds are passwords of as-yet-unknown purpose; keypasswds
@@ -254,3 +258,5 @@ void fdl_close( VOID *rab);
 #endif /* VMS */
 
 extern int compressSignature(byte *header);
+
+#endif /* PGP_H */