--- pgp/src/pgp.h	2018/04/24 16:39:03	1.1.1.3
+++ pgp/src/pgp.h	2018/04/24 16:41:58	1.1.1.6
@@ -9,6 +9,9 @@
 
 */
 
+#ifndef PGP_H
+#define PGP_H
+
 #include "usuals.h"
 #include "more.h"
 #include "armor.h"
@@ -118,40 +121,40 @@
 #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_KLUDGE	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)
 
@@ -193,9 +196,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;
@@ -219,6 +223,7 @@ extern boolean encrypt_to_self; /* Shoul
 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 */
@@ -229,7 +234,19 @@ 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 char password[256];
+extern boolean legal_kludge;
+extern int version_byte;
+extern boolean nomanual;
+
+/* These lists store hashed passwords for future use. */
+/* passwds are passwords of as-yet-unknown purpose; keypasswds
+   are passwords used to decrypt keys. */
+struct hashedpw {
+	struct hashedpw *next;
+	byte hash[16];
+};
+extern struct hashedpw *keypasswds, *passwds;
+
 extern boolean strip_spaces;
 
 #ifdef VMS
@@ -238,9 +255,11 @@ extern boolean strip_spaces;
  */
 
 int fdl_generate(char *in_file, char **fdl, short *len);
-void *fdl_create( char *fdl, short len, char *outfile, char *preserved_name);
-int fdl_copyfile2bin(FILE *f, void *rab, word32 longcount); 
-void fdl_close( void *rab);
+VOID *fdl_create( char *fdl, short len, char *outfile, char *preserved_name);
+int fdl_copyfile2bin(FILE *f, VOID *rab, word32 longcount); 
+void fdl_close( VOID *rab);
 #endif /* VMS */
 
 extern int compressSignature(byte *header);
+
+#endif /* PGP_H */