--- pgp/src/pgp.h	2018/04/24 16:43:21	1.1.1.7
+++ pgp/src/pgp.h	2018/04/24 16:44:25	1.1.1.8
@@ -125,7 +125,7 @@
 
 /* Version byte for data structures created by this version of PGP */
 #define	VERSION_BYTE_OLD	2	/* PGP2 */
-#define	VERSION_BYTE_KLUDGE	3
+#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 */
@@ -170,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 */
@@ -227,7 +221,6 @@ 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 */
@@ -238,9 +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 boolean legal_kludge;
 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