diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2004-05-21 19:40:29 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2004-05-21 19:40:29 +0000 |
| commit | 80d8c28c80356ebd4ad7c07da59839c2bee598c3 (patch) | |
| tree | 952e1bdd89ea1b03073b02ab33b4cc59a32b8ddc /src | |
| parent | 4b411a0426f66bc860885c46c1a3cd9b49cd5cb4 (diff) | |
| download | krb5-80d8c28c80356ebd4ad7c07da59839c2bee598c3.zip krb5-80d8c28c80356ebd4ad7c07da59839c2bee598c3.tar.gz krb5-80d8c28c80356ebd4ad7c07da59839c2bee598c3.tar.bz2 | |
pullup from trunk
ticket: 2551
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16346 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/crypto/aes/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/aes/aesopt.h | 19 | ||||
| -rw-r--r-- | src/lib/crypto/configure.in | 2 |
4 files changed, 25 insertions, 7 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index c69d4f2..4b6bd92 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2004-05-07 Ken Raeburn <raeburn@mit.edu> + + * configure.in: Check for endian.h and machine/endian.h. + 2004-03-22 Ken Raeburn <raeburn@mit.edu> * pbkdf2.c (hmac1): Make a local copy of the supplied keyblock diff --git a/src/lib/crypto/aes/ChangeLog b/src/lib/crypto/aes/ChangeLog index 5852b3b..f937690 100644 --- a/src/lib/crypto/aes/ChangeLog +++ b/src/lib/crypto/aes/ChangeLog @@ -1,3 +1,10 @@ +2004-05-07 Ken Raeburn <raeburn@mit.edu> + + * aesopt.h (PLATFORM_BYTE_ORDER): Check for _MIPSEB, _MIPSEL. If + endian.h or machine/endian.h is available, include it instead of + sys/param.h. Don't mess around with multibyte character + constants. + 2003-05-13 Ken Raeburn <raeburn@mit.edu> * aes_s2k.c (DEFAULT_ITERATION_COUNT): New macro; define to 4096. diff --git a/src/lib/crypto/aes/aesopt.h b/src/lib/crypto/aes/aesopt.h index 53fa4d5..da5c83b 100644 --- a/src/lib/crypto/aes/aesopt.h +++ b/src/lib/crypto/aes/aesopt.h @@ -176,13 +176,18 @@ # endif #elif defined(_MSC_VER) # include <stdlib.h> +#elif defined(_MIPSEB) +# define PLATFORM_BYTE_ORDER AES_BIG_ENDIAN +#elif defined(_MIPSEL) +# define PLATFORM_BYTE_ORDER AES_LITTLE_ENDIAN #elif !defined(WIN32) # include <stdlib.h> -#undef _ENDIAN_H /* XXX */ -# if !defined (_ENDIAN_H) -# include <sys/param.h> +# if defined(HAVE_ENDIAN_H) +# include <endian.h> +# elif defined(HAVE_MACHINE_ENDIAN_H) +# include <machine/endian.h> # else -# include _ENDIAN_H +# include <sys/param.h> # endif #endif @@ -231,10 +236,12 @@ #define PLATFORM_BYTE_ORDER AES_LITTLE_ENDIAN #elif 0 /* **** EDIT HERE IF NECESSARY **** */ #define PLATFORM_BYTE_ORDER AES_BIG_ENDIAN -#elif (('1234' >> 24) == '1') +#else +# error "barf" +/*#elif (('1234' >> 24) == '1') # define PLATFORM_BYTE_ORDER AES_LITTLE_ENDIAN #elif (('4321' >> 24) == '1') -# define PLATFORM_BYTE_ORDER AES_BIG_ENDIAN +# define PLATFORM_BYTE_ORDER AES_BIG_ENDIAN*/ #endif #endif diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index d675de4..4dc938a 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -AC_CHECK_HEADERS(memory.h unistd.h) +AC_CHECK_HEADERS(memory.h unistd.h endian.h machine/endian.h) KRB5_RUN_FLAGS KRB5_BUILD_PROGRAM |