Get the repository a bit closer to what will be released

[ppp.git] / pppd / sha1.h

diff --git a/pppd/sha1.h b/pppd/sha1.h
index 86f982d13cd3ed544db664227b0ccf919a725589..83f64df25843ac6f8bbd1bfe686a00c09ff8716a 100644 (file)
--- a/pppd/sha1.h
+++ b/pppd/sha1.h
@@ -8,9 +8,17 @@
 
 #ifndef __SHA1_INCLUDE_
 
+#ifndef SHA1_SIGNATURE_SIZE
+#ifdef SHA_DIGESTSIZE
+#define SHA1_SIGNATURE_SIZE SHA_DIGESTSIZE
+#else
+#define SHA1_SIGNATURE_SIZE 20
+#endif
+#endif
+
 typedef struct {
-    unsigned long state[5];
-    unsigned long count[2];
+    u_int32_t state[5];
+    u_int32_t count[2];
     unsigned char buffer[64];
 } SHA1_CTX;
 
@@ -21,10 +29,3 @@ extern void SHA1_Final(unsigned char[SHA1_SIGNATURE_SIZE], SHA1_CTX *);
 #define __SHA1_INCLUDE_
 #endif /* __SHA1_INCLUDE_ */
 
-#ifndef SHA1_SIGNATURE_SIZE
-#ifdef SHA_DIGESTSIZE
-#define SHA1_SIGNATURE_SIZE SHA_DIGESTSIZE
-#else
-#define SHA1_SIGNATURE_SIZE 20
-#endif
-#endif