From: miod <miod@openbsd.org>
Date: Tue, 22 Apr 2014 22:21:32 +0000 (+0000)
Subject: unifdef -UAES_LONG for we do not intend to run on platforms where int is smaller
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1571cfed7586976b53448a46f510adc1129af81a;p=openbsd

unifdef -UAES_LONG for we do not intend to run on platforms where int is smaller
than 32 bits.
---

diff --git a/lib/libcrypto/aes/aes.h b/lib/libcrypto/aes/aes.h
index 4d477bdf193..d05f803494b 100644
--- a/lib/libcrypto/aes/aes.h
+++ b/lib/libcrypto/aes/aes.h
@@ -74,11 +74,7 @@ extern "C" {
 
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
-#ifdef AES_LONG
-	unsigned long rd_key[4 *(AES_MAXNR + 1)];
-#else
 	unsigned int rd_key[4 *(AES_MAXNR + 1)];
-#endif
 	int rounds;
 };
 typedef struct aes_key_st AES_KEY;
diff --git a/lib/libcrypto/aes/aes_locl.h b/lib/libcrypto/aes/aes_locl.h
index 1d0e86331e4..ac2fbff465e 100644
--- a/lib/libcrypto/aes/aes_locl.h
+++ b/lib/libcrypto/aes/aes_locl.h
@@ -65,11 +65,7 @@
 #define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
 #define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
 
-#ifdef AES_LONG
-typedef unsigned long u32;
-#else
 typedef unsigned int u32;
-#endif
 typedef unsigned short u16;
 typedef unsigned char u8;
 
diff --git a/lib/libssl/src/crypto/aes/aes.h b/lib/libssl/src/crypto/aes/aes.h
index 4d477bdf193..d05f803494b 100644
--- a/lib/libssl/src/crypto/aes/aes.h
+++ b/lib/libssl/src/crypto/aes/aes.h
@@ -74,11 +74,7 @@ extern "C" {
 
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
-#ifdef AES_LONG
-	unsigned long rd_key[4 *(AES_MAXNR + 1)];
-#else
 	unsigned int rd_key[4 *(AES_MAXNR + 1)];
-#endif
 	int rounds;
 };
 typedef struct aes_key_st AES_KEY;
diff --git a/lib/libssl/src/crypto/aes/aes_locl.h b/lib/libssl/src/crypto/aes/aes_locl.h
index 1d0e86331e4..ac2fbff465e 100644
--- a/lib/libssl/src/crypto/aes/aes_locl.h
+++ b/lib/libssl/src/crypto/aes/aes_locl.h
@@ -65,11 +65,7 @@
 #define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
 #define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
 
-#ifdef AES_LONG
-typedef unsigned long u32;
-#else
 typedef unsigned int u32;
-#endif
 typedef unsigned short u16;
 typedef unsigned char u8;