diff options
| author |   miod <miod@openbsd.org> | 2014-04-23 18:40:39 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-04-23 18:40:39 +0000 |
| commit | 21951995da0d211833eb68722f3ca632c979838b (patch) | |
| tree | 08a717b5eec2fb0d1f244ad8aa045dc9e9725013 /lib/libcrypto/rc4/rc4_enc.c | |
| parent | Remove more Kerberos cruft. (diff) | |
| download | wireguard-openbsd-21951995da0d211833eb68722f3ca632c979838b.tar.xz wireguard-openbsd-21951995da0d211833eb68722f3ca632c979838b.zip | |
Figure out endianness at compile-time, using _BYTE_ORDER from
<machine/endian.h>, rather than writing 1 to a 32-bit variable and checking
whether the first byte is nonzero.
tweaks and ok matthew@; ok beck@ tedu@
Diffstat (limited to 'lib/libcrypto/rc4/rc4_enc.c')
| -rw-r--r-- | lib/libcrypto/rc4/rc4_enc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/libcrypto/rc4/rc4_enc.c b/lib/libcrypto/rc4/rc4_enc.c index 8c4fc6c7a3d..d8fc939dac7 100644 --- a/lib/libcrypto/rc4/rc4_enc.c +++ b/lib/libcrypto/rc4/rc4_enc.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include <machine/endian.h> #include <openssl/rc4.h> #include "rc4_locl.h" @@ -124,7 +125,6 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, ((size_t)outdata & (sizeof(RC4_CHUNK)-1)) ) == 0 ) { RC4_CHUNK ichunk,otp; - const union { long one; char little; } is_endian = {1}; /* * I reckon we can afford to implement both endian @@ -132,14 +132,10 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, * because the machine code appears to be very compact * and redundant 1-2KB is perfectly tolerable (i.e. * in case the compiler fails to eliminate it:-). By - * suggestion from Terrel Larson <terr@terralogic.net> - * who also stands for the is_endian union:-) + * suggestion from Terrel Larson <terr@terralogic.net>. * * Special notes. * - * - is_endian is declared automatic as doing otherwise - * (declaring static) prevents gcc from eliminating - * the redundant code; * - compilers (those I've tried) don't seem to have * problems eliminating either the operators guarded * by "if (sizeof(RC4_CHUNK)==8)" or the condition @@ -154,7 +150,7 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, * * <appro@fy.chalmers.se> */ - if (!is_endian.little) + if (_BYTE_ORDER != _LITTLE_ENDIAN) { /* BIG-ENDIAN CASE */ # define BESHFT(c) (((sizeof(RC4_CHUNK)-(c)-1)*8)&(sizeof(RC4_CHUNK)*8-1)) for (;len&(0-sizeof(RC4_CHUNK));len-=sizeof(RC4_CHUNK)) |