From f257413772464724e9b5cba47e3b612096e2887d Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 30 Sep 2016 08:26:08 +0200
Subject: [PATCH] uint32 -> uint32_t

---
 .../crypto_stream/aes128ctr/portable/afternm_aes128ctr.c  | 2 +-
 src/libsodium/crypto_stream/aes128ctr/portable/int128.h   | 2 +-
 .../crypto_stream/aes128ctr/portable/int128_aes128ctr.c   | 8 ++++----
 .../aes128ctr/portable/xor_afternm_aes128ctr.c            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
index 6f0cec62..d8feca50 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
@@ -35,7 +35,7 @@ int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
   unsigned char *np;
   unsigned char b;
 
-  uint32 tmp;
+  uint32_t tmp;
 
   /* Copy nonce on the stack */
   copy2(&nonce_stack, (const int128 *) (nonce + 0));
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/int128.h b/src/libsodium/crypto_stream/aes128ctr/portable/int128.h
index 91e8e45f..c5ee0189 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/int128.h
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/int128.h
@@ -51,6 +51,6 @@ void toggle(int128 *r);
 void xor_rcon(int128 *r);
 
 #define add_uint32_big crypto_stream_aes128ctr_portable_add_uint32_big
-void add_uint32_big(int128 *r, uint32 x);
+void add_uint32_big(int128 *r, uint32_t x);
 
 #endif
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c
index d7fe2bc9..5563d4a0 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c
@@ -67,7 +67,7 @@ void shufd(int128 *r, const int128 *x, const unsigned int c)
 void rshift32_littleendian(int128 *r, const unsigned int n)
 {
   unsigned char *rp = (unsigned char *)r;
-  uint32 t;
+  uint32_t t;
   t = LOAD32_LE(rp);
   t >>= n;
   STORE32_LE(rp, t);
@@ -115,16 +115,16 @@ void toggle(int128 *r)
 void xor_rcon(int128 *r)
 {
   unsigned char *rp = (unsigned char *)r;
-  uint32 t;
+  uint32_t t;
   t = LOAD32_LE(rp+12);
   t ^= 0xffffffff;
   STORE32_LE(rp+12, t);
 }
 
-void add_uint32_big(int128 *r, uint32 x)
+void add_uint32_big(int128 *r, uint32_t x)
 {
   unsigned char *rp = (unsigned char *)r;
-  uint32 t;
+  uint32_t t;
   t = LOAD32_LE(rp+12);
   t += x;
   STORE32_LE(rp+12, t);
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
index c65d73ba..6110c0f3 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
@@ -35,7 +35,7 @@ int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char
   unsigned char *np;
   unsigned char b;
 
-  uint32 tmp;
+  uint32_t tmp;
 
   /* Copy nonce on the stack */
   copy2(&nonce_stack, (const int128 *) (nonce + 0));