--- pgp/src/md5.h	2018/04/24 16:40:11	1.1.1.4
+++ pgp/src/md5.h	2018/04/24 16:43:38	1.1.1.7
@@ -1,66 +1,27 @@
-/*
- ***********************************************************************
- ** md5.h -- header file for implementation of MD5                    **
- ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
- ** Created: 2/17/90 RLR                                              **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
- ** Revised (for MD5): RLR 4/27/91                                    **
- **   -- G modified to have y&~z instead of y&z                       **
- **   -- FF, GG, HH modified to add in last register done             **
- **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
- **   -- distinct additive constant for each step                     **
- **   -- round 4 added, working mod 7                                 **
- ***********************************************************************
- */
-
-/*
- * Edited 7 May 93 by CP to change the interface to match that
- * of the MD5 routines in RSAREF.  Due to this alteration, this
- * code is "derived from the RSA Data Security, Inc. MD5 Message-
- * Digest Algorithm".  (See below.)  Also added argument names
- * to the prototypes.
- */
+#ifndef MD5_H
+#define MD5_H
 
-/*
- ***********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
- **                                                                   **
- ** License to copy and use this software is granted provided that    **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
- ** Digest Algorithm" in all material mentioning or referencing this  **
- ** software or this function.                                        **
- **                                                                   **
- ** License is also granted to make and use derivative works          **
- ** provided that such works are identified as "derived from the RSA  **
- ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
- ** material mentioning or referencing the derived work.              **
- **                                                                   **
- ** RSA Data Security, Inc. makes no representations concerning       **
- ** either the merchantability of this software or the suitability    **
- ** of this software for any particular purpose.  It is provided "as  **
- ** is" without express or implied warranty of any kind.              **
- **                                                                   **
- ** These notices must be retained in any copies of any part of this  **
- ** documentation and/or software.                                    **
- ***********************************************************************
- */
-
-/* typedef a 32-bit type */
 #ifdef __alpha
-typedef unsigned int UINT4;
+typedef unsigned int uint32;
 #else
-typedef unsigned long int UINT4;
+typedef unsigned long uint32;
 #endif
 
-/* Data structure for MD5 (Message-Digest) computation */
-typedef struct {
-  UINT4 buf[4];                                    /* scratch buffer */
-  UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
-  unsigned char in[64];                              /* input buffer */
-} MD5_CTX;
+struct MD5Context {
+	uint32 buf[4];
+	uint32 bits[2];
+	unsigned char in[64];
+};
+
+void MD5Init(struct MD5Context *context);
+void MD5Update(struct MD5Context *context, unsigned char const *buf,
+	       unsigned len);
+void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
-void MD5Init(MD5_CTX *mdContext);
-void MD5Update(MD5_CTX *mdContext, unsigned char *bug, unsigned int len);
-void MD5Final(unsigned char digest[16], MD5_CTX *mdContext);
-void Transform(UINT4 *buf, UINT4 *in);
+/*
+ * This is needed to make RSAREF happy on some MS-DOS compilers.
+ */
+typedef struct MD5Context MD5_CTX;
 
+#endif /* !MD5_H */