--- pgp/src/crypto.h	2018/04/24 16:39:34	1.1.1.3
+++ pgp/src/crypto.h	2018/04/24 16:45:47	1.1.1.7
@@ -1,86 +1,106 @@
-/* crypto.h - C headers for crypto.c 
-*/
-
-/* Used to determine if nesting should be allowed */
-boolean legal_ctb(byte ctb);
-
-/* Write an RSA-signed message digest of input file to specified output
-   file, and append input file to output file */
-int signfile(boolean nested, boolean separate_signature, char *mcguffin,
-			 char *infile, char *outfile, char lit_mode, char *literalfile);
-
-/* Reads the first count bytes from infile into header */
-int get_header_info_from_file(char *infile, byte *header, int count);
-
-/* RSA-encrypt a file */
-int encryptfile(char **mcguffin, char *infile, char *outfile, 
-	boolean attempt_compression);
-
-/* Encrypt file with IPES/IDEA cipher */
-int idea_encryptfile(char *infile, char *outfile, 
-	boolean attempt_compression);
-
-/* Prepend a CTB_LITERAL prefix to a file */
-int make_literal(char *infile, char *outfile, char lit_mode, char *literalfile);
-
-/* Decrypt a file (RSA or IPES/IDEA) */
-int decryptfile(char *infile, char *outfile);
-
-/* Check signature in infile for validity.  Strip off the signature and
-   write the remaining packet to outfile */
-int check_signaturefile(char *infile, char *outfile, boolean strip_signature,
-			char *preserved_name);
-
-/* Decrypt file with IPES/IDEA only */
-int idea_decryptfile(char *infile, char *outfile);
-
-/* Decompress a file with ZIP algorithm */
-int decompress_file(char *infile, char *outfile);
-
-/* Strip off literal prefix from infile, copying to outfile */
-int strip_literal(char *infile, char *outfile, char *preserved_name,
-		char *lit_mode);
-
-/* Write a multiprecision integer to a file */
-void write_mpi(unitptr n, FILE *f, boolean scrambled);
-
-/* Read a mutiprecision integer from a file */
-int read_mpi(unitptr r, FILE *f, boolean adjust_precision, boolean scrambled);
-
-/* Convert C <-> Quiche strings */
-void CToPascal(char *s);
-void PascalToC( char *s );
-
-/* Tests if a randseed.bin file exists already */
-int seedfile_exists(void);
-
-/* Creates a randseed.bin file (call if above returns false) */
-void create_seedfile(void);
-
-/*	Return date string, given pointer to 32-bit timestamp */
-char *cdate(word32 *tstamp);
-
-/*	Return date and time string, given pointer to 32-bit timestamp */
-char *ctdate(word32 *tstamp);
-
-/* Return current timestamp as a byte array and as a 32-bit word */
-word32 get_timestamp(byte *timestamp);
-
-/*	Returns the length of a packet according to the CTB and the length field */
-word32 getpastlength(byte ctb, FILE *f);
-
-/* Write a CTB with the appropriate length field */
-void write_ctb_len (FILE *f, byte ctb_type, word32 length, boolean big);
-
-/* Print an error message and return nonzero if val != checkval */
-int version_error (int val, int checkval);
-
-int check_key_sig(FILE *fkey, long fpkey, int keypktlen, char *keyuserid,
-	 FILE *fsig, long fpsig, char *keyfile, char *siguserid, byte *xtimestamp,
-	 byte *sigclass);
-
-int squish_file(char *infile, char *outfile);
-
-int signkey(char *keyguffin, char *sigguffin, char *keyfile);
-
-extern int compromise(byte *keyID, char *keyfile);
+/* crypto.h - C headers for crypto.c 
+ */
+
+#include "idea.h" /* Declaration of IdeaCfbContext */
+
+/* Used to determine if nesting should be allowed */
+boolean legal_ctb(byte ctb);
+
+/* Write an RSA-signed message digest of input file to specified output
+   file, and append input file to output file */
+int signfile(boolean nested, boolean separate_signature, char *mcguffin,
+	  char *infile, char *outfile, char lit_mode, char *literalfile);
+
+/* Reads the first count bytes from infile into header */
+int get_header_info_from_file(char *infile, byte * header, int count);
+
+/* RSA-encrypt a file */
+int encryptfile(char **mcguffin, char *infile, char *outfile,
+		boolean attempt_compression);
+
+/* Encrypt file with IPES/IDEA cipher */
+int idea_encryptfile(char *infile, char *outfile,
+		     boolean attempt_compression);
+
+/* Prepend a CTB_LITERAL prefix to a file */
+int make_literal(char *infile, char *outfile, char lit_mode,
+		 char *literalfile);
+
+/* Decrypt a file (RSA or IPES/IDEA) */
+int decryptfile(char *infile, char *outfile);
+
+/* Check signature in infile for validity.  Strip off the signature and
+   write the remaining packet to outfile */
+int check_signaturefile(char *infile, char *outfile, boolean strip_signature,
+			char *preserved_name);
+
+/* Decrypt file with IPES/IDEA only */
+int idea_decryptfile(char *infile, char *outfile);
+
+/* Decompress a file with ZIP algorithm */
+int decompress_file(char *infile, char *outfile);
+
+/* Strip off literal prefix from infile, copying to outfile */
+int strip_literal(char *infile, char *outfile, char *preserved_name,
+		  char *lit_mode);
+
+#ifdef _VMS_VAXC
+void write_mpi();
+int read_mpi();
+#else
+
+/* Write a multiprecision integer to a file */
+void write_mpi(unitptr n, FILE * f, struct IdeaCfbContext *cfb);
+
+/* Read a multiprecision integer from a file */
+int read_mpi(unitptr r, FILE * f, boolean adjust_precision,
+ 	     struct IdeaCfbContext *cfb);
+#endif
+
+/* Convert C <-> Quiche strings */
+void CToPascal(char *s);
+void PascalToC(char *s);
+
+/* Tests if a randseed.bin file exists already */
+int seedfile_exists(void);
+
+/* Creates a randseed.bin file (call if above returns false) */
+void create_seedfile(void);
+
+/*      Return date string, given pointer to 32-bit timestamp */
+char *cdate(word32 * tstamp);
+
+/*      Return date and time string, given pointer to 32-bit timestamp */
+char *ctdate(word32 * tstamp);
+
+/* Return current timestamp as a byte array and as a 32-bit word */
+word32 get_timestamp(byte * timestamp);
+
+/*      Returns the length of a packet according to the CTB and the
+	length field */
+word32 getpastlength(byte ctb, FILE * f);
+
+/* Write a CTB with the appropriate length field */
+void write_ctb_len(FILE * f, byte ctb_type, word32 length, boolean big);
+
+/* Print an error message and return nonzero if val != checkval */
+int version_error(int val, int checkval);
+/* The same, if val is not a recognized version */
+int version_byte_error(int val);
+
+int check_key_sig(FILE * fkey, long fpkey, int keypktlen, char *keyuserid,
+		  FILE * fsig, long fpsig, char *keyfile, char *siguserid,
+		  byte * xtimestamp,
+		  byte * sigclass);
+
+int squish_file(char *infile, char *outfile);
+
+int do_sign(char *keyfile, long fp, int pktlen, byte *userid, byte *keyID,
+            char *sigguffin, boolean batchmode);
+
+int signkey(char *keyguffin, char *sigguffin, char *keyfile);
+
+extern int compromise(byte * keyID, char *keyfile);
+ 
+void showKeyHash(unitptr n, unitptr e);
+int GetHashedPassPhrase(char *hash, boolean noecho);