|
 |
138d55 |
diff -up cyrus-sasl-2.1.27/configure.ac.sizes cyrus-sasl-2.1.27/configure.ac
|
|
|
138d55 |
--- cyrus-sasl-2.1.27/configure.ac.sizes 2015-11-18 09:46:24.000000000 +0100
|
|
|
138d55 |
+++ cyrus-sasl-2.1.27/configure.ac 2015-11-20 15:11:20.474588247 +0100
|
|
|
138d55 |
@@ -1312,6 +1312,10 @@ AC_HEADER_STDC
|
|
|
138d55 |
AC_HEADER_DIRENT
|
|
|
138d55 |
AC_HEADER_SYS_WAIT
|
|
|
138d55 |
AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
|
|
|
138d55 |
+AC_CHECK_TYPES([long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],,,[
|
|
|
138d55 |
+#ifdef HAVE_INTTYPES_H
|
|
|
138d55 |
+#include <inttypes.h>
|
|
|
138d55 |
+#endif])
|
|
|
138d55 |
|
|
|
138d55 |
IPv6_CHECK_SS_FAMILY()
|
|
|
138d55 |
IPv6_CHECK_SA_LEN()
|
|
|
138d55 |
diff -up cyrus-sasl-2.1.27/include/makemd5.c.sizes cyrus-sasl-2.1.27/include/makemd5.c
|
|
|
138d55 |
--- cyrus-sasl-2.1.27/include/makemd5.c.sizes 2015-10-15 15:44:43.000000000 +0200
|
|
|
138d55 |
+++ cyrus-sasl-2.1.27/include/makemd5.c 2015-11-20 15:11:20.477588240 +0100
|
|
|
138d55 |
@@ -82,12 +82,19 @@
|
|
|
138d55 |
*/
|
|
|
138d55 |
|
|
|
138d55 |
|
|
|
138d55 |
+#ifdef HAVE_CONFIG_H
|
|
|
138d55 |
+#include "../config.h"
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
|
|
|
138d55 |
#include <stdio.h>
|
|
|
138d55 |
#include <string.h>
|
|
|
138d55 |
#include <stdlib.h>
|
|
|
138d55 |
#include <ctype.h>
|
|
|
138d55 |
|
|
|
138d55 |
+#ifdef HAVE_INTTYPES_H
|
|
|
138d55 |
+#include <inttypes.h>
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+
|
|
|
138d55 |
|
|
|
138d55 |
static void
|
|
|
138d55 |
my_strupr(char *s)
|
|
|
138d55 |
@@ -122,6 +129,18 @@ my_strupr(char *s)
|
|
|
138d55 |
static void
|
|
|
138d55 |
try_signed(FILE *f, int len)
|
|
|
138d55 |
{
|
|
|
138d55 |
+#ifdef HAVE_INT8_T
|
|
|
138d55 |
+ BITSIZE(int8_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_INT16_T
|
|
|
138d55 |
+ BITSIZE(int16_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_INT32_T
|
|
|
138d55 |
+ BITSIZE(int32_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_INT64_T
|
|
|
138d55 |
+ BITSIZE(int64_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
BITSIZE(signed char);
|
|
|
138d55 |
BITSIZE(short);
|
|
|
138d55 |
BITSIZE(int);
|
|
|
138d55 |
@@ -135,6 +154,18 @@ try_signed(FILE *f, int len)
|
|
|
138d55 |
static void
|
|
|
138d55 |
try_unsigned(FILE *f, int len)
|
|
|
138d55 |
{
|
|
|
138d55 |
+#ifdef HAVE_UINT8_T
|
|
|
138d55 |
+ BITSIZE(uint8_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_UINT16_T
|
|
|
138d55 |
+ BITSIZE(uint16_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_UINT32_T
|
|
|
138d55 |
+ BITSIZE(uint32_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
+#ifdef HAVE_UINT64_T
|
|
|
138d55 |
+ BITSIZE(uint64_t);
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
BITSIZE(unsigned char);
|
|
|
138d55 |
BITSIZE(unsigned short);
|
|
|
138d55 |
BITSIZE(unsigned int);
|
|
|
138d55 |
@@ -165,6 +196,11 @@ static int print_pre(FILE *f)
|
|
|
138d55 |
"/* POINTER defines a generic pointer type */\n"
|
|
|
138d55 |
"typedef unsigned char *POINTER;\n"
|
|
|
138d55 |
"\n"
|
|
|
138d55 |
+#ifdef HAVE_INTTYPES_H
|
|
|
138d55 |
+ "/* We try to define integer types for our use */\n"
|
|
|
138d55 |
+ "#include <inttypes.h>\n"
|
|
|
138d55 |
+ "\n"
|
|
|
138d55 |
+#endif
|
|
|
138d55 |
);
|
|
|
138d55 |
return 1;
|
|
|
138d55 |
}
|
|
|
138d55 |
@@ -212,31 +248,15 @@ int main(int argc, char **argv)
|
|
|
138d55 |
|
|
|
138d55 |
print_pre(f);
|
|
|
138d55 |
|
|
|
138d55 |
-#ifndef HAVE_INT8_T
|
|
|
138d55 |
try_signed (f, 8);
|
|
|
138d55 |
-#endif /* HAVE_INT8_T */
|
|
|
138d55 |
-#ifndef HAVE_INT16_T
|
|
|
138d55 |
try_signed (f, 16);
|
|
|
138d55 |
-#endif /* HAVE_INT16_T */
|
|
|
138d55 |
-#ifndef HAVE_INT32_T
|
|
|
138d55 |
try_signed (f, 32);
|
|
|
138d55 |
-#endif /* HAVE_INT32_T */
|
|
|
138d55 |
-#ifndef HAVE_INT64_T
|
|
|
138d55 |
try_signed (f, 64);
|
|
|
138d55 |
-#endif /* HAVE_INT64_T */
|
|
|
138d55 |
|
|
|
138d55 |
-#ifndef HAVE_U_INT8_T
|
|
|
138d55 |
try_unsigned (f, 8);
|
|
|
138d55 |
-#endif /* HAVE_INT8_T */
|
|
|
138d55 |
-#ifndef HAVE_U_INT16_T
|
|
|
138d55 |
try_unsigned (f, 16);
|
|
|
138d55 |
-#endif /* HAVE_U_INT16_T */
|
|
|
138d55 |
-#ifndef HAVE_U_INT32_T
|
|
|
138d55 |
try_unsigned (f, 32);
|
|
|
138d55 |
-#endif /* HAVE_U_INT32_T */
|
|
|
138d55 |
-#ifndef HAVE_U_INT64_T
|
|
|
138d55 |
try_unsigned (f, 64);
|
|
|
138d55 |
-#endif /* HAVE_U_INT64_T */
|
|
|
138d55 |
|
|
|
138d55 |
print_post(f);
|
|
|
138d55 |
|