--- pgp/src/pgp.h	2018/04/24 16:39:03	1.1.1.3
+++ pgp/src/pgp.h	2018/04/24 16:39:54	1.1.1.4
@@ -219,6 +219,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 +230,16 @@ 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];
+
+/* 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 +248,9 @@ 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);