diff options
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | configure.in | 17 | ||||
-rw-r--r-- | defines.h | 7 | ||||
-rw-r--r-- | rijndael.c | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/acconfig.h b/acconfig.h index c1c7c243b..76eb3a9e9 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.114 2001/08/16 00:09:50 mouring Exp $ */ | 1 | /* $Id: acconfig.h,v 1.115 2001/09/15 11:31:54 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -253,6 +253,7 @@ | |||
253 | #undef HAVE_UINTXX_T | 253 | #undef HAVE_UINTXX_T |
254 | #undef HAVE_INT64_T | 254 | #undef HAVE_INT64_T |
255 | #undef HAVE_U_INT64_T | 255 | #undef HAVE_U_INT64_T |
256 | #undef HAVE_U_CHAR | ||
256 | #undef HAVE_SOCKLEN_T | 257 | #undef HAVE_SOCKLEN_T |
257 | #undef HAVE_SIZE_T | 258 | #undef HAVE_SIZE_T |
258 | #undef HAVE_SSIZE_T | 259 | #undef HAVE_SSIZE_T |
diff --git a/configure.in b/configure.in index 007a95ee9..fc0d4797e 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.307 2001/08/16 00:09:50 mouring Exp $ | 1 | # $Id: configure.in,v 1.308 2001/09/15 11:31:54 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -910,6 +910,21 @@ then | |||
910 | ) | 910 | ) |
911 | fi | 911 | fi |
912 | 912 | ||
913 | |||
914 | AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [ | ||
915 | AC_TRY_COMPILE( | ||
916 | [ | ||
917 | #include <sys/types.h> | ||
918 | ], | ||
919 | [ u_char foo; foo = 125; ], | ||
920 | [ ac_cv_have_u_char="yes" ], | ||
921 | [ ac_cv_have_u_char="no" ] | ||
922 | ) | ||
923 | ]) | ||
924 | if test "x$ac_cv_have_u_char" = "xyes" ; then | ||
925 | AC_DEFINE(HAVE_U_CHAR) | ||
926 | fi | ||
927 | |||
913 | AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [ | 928 | AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [ |
914 | AC_TRY_COMPILE( | 929 | AC_TRY_COMPILE( |
915 | [ | 930 | [ |
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.70 2001/08/16 00:09:50 mouring Exp $ */ | 4 | /* $Id: defines.h,v 1.71 2001/09/15 11:31:54 djm Exp $ */ |
5 | 5 | ||
6 | /* Necessary headers */ | 6 | /* Necessary headers */ |
7 | 7 | ||
@@ -238,6 +238,11 @@ typedef unsigned long long int u_int64_t; | |||
238 | # define HAVE_LONG_LONG_INT 1 | 238 | # define HAVE_LONG_LONG_INT 1 |
239 | #endif | 239 | #endif |
240 | 240 | ||
241 | #ifndef HAVE_U_CHAR | ||
242 | typedef unsigned char u_char; | ||
243 | # define HAVE_U_CHAR | ||
244 | #endif /* HAVE_U_CHAR */ | ||
245 | |||
241 | #ifndef HAVE_SOCKLEN_T | 246 | #ifndef HAVE_SOCKLEN_T |
242 | typedef unsigned int socklen_t; | 247 | typedef unsigned int socklen_t; |
243 | # define HAVE_SOCKLEN_T | 248 | # define HAVE_SOCKLEN_T |
diff --git a/rijndael.c b/rijndael.c index 1478c1223..f28a9c669 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -25,6 +25,8 @@ | |||
25 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | 25 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, |
26 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ | 27 | */ |
28 | #include "config.h" | ||
29 | |||
28 | #include <stdlib.h> | 30 | #include <stdlib.h> |
29 | #include <string.h> | 31 | #include <string.h> |
30 | 32 | ||