X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fppp-sha1.c;h=9ff3a2496d3df2cffbf9cb745c107b6319d71524;hb=797cdae57c27ed74a5ec3b4675f31f2c6cfc98ae;hp=437c8ba034a0b4bda0da4ca94520b9bedc7d8c23;hpb=35198adc7f3c1f0c1e3437f983e7f3ac96477997;p=ppp.git

diff --git a/pppd/ppp-sha1.c b/pppd/ppp-sha1.c
index 437c8ba..9ff3a24 100644
--- a/pppd/ppp-sha1.c
+++ b/pppd/ppp-sha1.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "ppp-crypto-priv.h"
+#include "crypto-priv.h"
 
 
 /* #define SHA1HANDSOFF * Copies data before messing with it. */
@@ -110,14 +110,14 @@ static void sha1_clean(PPP_MD_CTX *ctx)
 #include <netinet/in.h>	/* htonl() */
 
 typedef struct {
-    u_int32_t state[5];
-    u_int32_t count[2];
+    uint32_t state[5];
+    uint32_t count[2];
     unsigned char buffer[64];
 } SHA1_CTX;
 
 
 static void
-SHA1_Transform(u_int32_t[5], const unsigned char[64]);
+SHA1_Transform(uint32_t[5], const unsigned char[64]);
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
@@ -138,12 +138,12 @@ SHA1_Transform(u_int32_t[5], const unsigned char[64]);
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 
 static void
-SHA1_Transform(u_int32_t state[5], const unsigned char buffer[64])
+SHA1_Transform(uint32_t state[5], const unsigned char buffer[64])
 {
-    u_int32_t a, b, c, d, e;
+    uint32_t a, b, c, d, e;
     typedef union {
 	unsigned char c[64];
-	u_int32_t l[16];
+	uint32_t l[16];
     } CHAR64LONG16;
     CHAR64LONG16 *block;
 
@@ -236,7 +236,7 @@ SHA1_Update(SHA1_CTX *context, const unsigned char *data, unsigned int len)
 static void
 SHA1_Final(unsigned char digest[20], SHA1_CTX *context)
 {
-    u_int32_t i, j;
+    uint32_t i, j;
     unsigned char finalcount[8];
 
     for (i = 0; i < 8; i++) {