Get rid of builtin AES uitypes.h

Remove uitypes.h and just include stdint.h; all we need from it is
uint{8,16,32}_t.

3 files changed, 4 insertions, 89 deletions

diff --git a/src/lib/crypto/builtin/aes/aes.h b/src/lib/crypto/builtin/aes/aes.h
index 7621904635..8f6f426b92 100644
--- a/src/lib/crypto/builtin/aes/aes.h
+++ b/src/lib/crypto/builtin/aes/aes.h
@@ -33,7 +33,7 @@
 #ifndef _AES_H
 #define _AES_H
 
-#include "uitypes.h"
+#include <stdint.h>
 
 /*  BLOCK_SIZE is in BYTES: 16, 24, 32 or undefined for aes.c and 16, 20,
     24, 28, 32 or undefined for aespp.c.  When left undefined a slower
diff --git a/src/lib/crypto/builtin/aes/deps b/src/lib/crypto/builtin/aes/deps
index 707d218128..fcd5520cd7 100644
--- a/src/lib/crypto/builtin/aes/deps
+++ b/src/lib/crypto/builtin/aes/deps
@@ -2,9 +2,8 @@
 # Generated makefile dependencies follow.
 #
 aescrypt.so aescrypt.po $(OUTPRE)aescrypt.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h aes.h aescrypt.c aesopt.h \
-  uitypes.h
+  $(BUILDTOP)/include/autoconf.h aes.h aescrypt.c aesopt.h
 aestab.so aestab.po $(OUTPRE)aestab.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  aes.h aesopt.h aestab.c uitypes.h
+  aes.h aesopt.h aestab.c
 aeskey.so aeskey.po $(OUTPRE)aeskey.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  aes.h aeskey.c aesopt.h uitypes.h
+  aes.h aeskey.c aesopt.h
diff --git a/src/lib/crypto/builtin/aes/uitypes.h b/src/lib/crypto/builtin/aes/uitypes.h
deleted file mode 100644
index 563139f663..0000000000
--- a/src/lib/crypto/builtin/aes/uitypes.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
- * All rights reserved.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explcit or implied warranties
- * in respect of any properties, including, but not limited to, correctness
- * and fitness for purpose.
- */
-
-/*
- * Issue Date: 01/02/2002
- *
- * This file contains code to obtain or set the definitions for fixed length
- * unsigned integer types.
- */
-
-#ifndef _UITYPES_H
-#define _UITYPES_H
-
-#include "autoconf.h"
-
-#if defined(__GNU_LIBRARY__)
-#define HAS_INTTYPES_H
-#elif !defined(_MSC_VER)
-#include <limits.h>
-#if ULONG_MAX > 0xFFFFFFFFUL
-  #define MODEL_64
-#else
-  #define MODEL_32
-#endif
-#endif
-
-#if defined HAS_INTTYPES_H || defined HAVE_INTTYPES_H
-#include <inttypes.h>
-#define s_u32     u
-#define s_u64   ull
-#elif defined MODEL_32
-typedef unsigned char            uint8_t;
-typedef unsigned short int      uint16_t;
-typedef unsigned int            uint32_t;
-typedef unsigned long long int  uint64_t;
-#define s_u32     u
-#define s_u64   ull
-#elif defined MODEL_64
-typedef unsigned char            uint8_t;
-typedef unsigned short int      uint16_t;
-typedef unsigned int            uint32_t;
-typedef unsigned long int       uint64_t;
-#define s_u32     u
-#define s_u64    ul
-#elif defined(_MSC_VER)
-typedef unsigned  __int8         uint8_t;
-typedef unsigned __int16        uint16_t;
-typedef unsigned __int32        uint32_t;
-typedef unsigned __int64        uint64_t;
-#define s_u32    ui32
-#define s_u64    ui64
-#else
-#error You need to define fixed length types in uitypes.h
-#endif
-
-#define sfx_lo(x,y) x##y
-#define sfx_hi(x,y) sfx_lo(x,y)
-#define x_32(p)     sfx_hi(0x##p,s_u32)
-#define x_64(p)     sfx_hi(0x##p,s_u64)
-
-#endif