s/u_int32_t/uint32_t/g

diff --git a/ldns/sha1.h b/ldns/sha1.h
index e443ce69bcdc3ef032e6ccbcd0d94dc7f0693825..ca2456e295715b937fdf1a4275493fa2dd3f0694 100644 (file)
--- a/ldns/sha1.h
+++ b/ldns/sha1.h
@@ -5,13 +5,13 @@
 #define LDNS_SHA1_DIGEST_LENGTH              20
 
 typedef struct {
-        u_int32_t       state[5];
-        u_int64_t       count;
+        uint32_t       state[5];
+        uint64_t       count;
         unsigned char   buffer[LDNS_SHA1_BLOCK_LENGTH];
 } ldns_sha1_ctx;
   
 void ldns_sha1_init(ldns_sha1_ctx * context);
-void ldns_sha1_transform(u_int32_t state[5], const unsigned char buffer[LDNS_SHA1_BLOCK_LENGTH]);
+void ldns_sha1_transform(uint32_t state[5], const unsigned char buffer[LDNS_SHA1_BLOCK_LENGTH]);
 void ldns_sha1_update(ldns_sha1_ctx *context, const unsigned char *data, unsigned int len);
 void ldns_sha1_final(unsigned char digest[LDNS_SHA1_DIGEST_LENGTH], ldns_sha1_ctx *context);
 

diff --git a/sha1.c b/sha1.c
index 3f7b62b0b4c722195ddae618403d5398c943191a..fcc3e045ce09e98b069ed7dbf1c3e27b560d9fb7 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -43,9 +43,9 @@
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 
 void
-ldns_sha1_transform(u_int32_t state[5], const unsigned char buffer[LDNS_SHA1_BLOCK_LENGTH])
+ldns_sha1_transform(uint32_t state[5], const unsigned char buffer[LDNS_SHA1_BLOCK_LENGTH])
 {
-    u_int32_t a, b, c, d, e;
+    uint32_t a, b, c, d, e;
     typedef union {
         unsigned char c[64];
         unsigned int l[16];
@@ -122,7 +122,7 @@ ldns_sha1_update(ldns_sha1_ctx *context, const unsigned char *data, unsigned int
     unsigned int i;
     unsigned int j;
 
-    j = (u_int32_t)((context->count >> 3) & 63);
+    j = (uint32_t)((context->count >> 3) & 63);
     context->count += (len << 3);
     if ((j + len) > 63) {
         bcopy(data, &context->buffer[j], (i = 64 - j));