From eb3e7d7ffe444652fe6f90808f95e08bc99cf5ae Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 9 Jul 2014 16:06:14 +0000
Subject: Remove leading underscore from _BYTE_ORDER and _{LITTLE,BIG}_ENDIAN,
 to be more friendly to systems where the underscore flavours may be defined
 as empty. Found the hard way be bcook@; joint brainstrom with bcook beck and
 guenther

---
 src/lib/libcrypto/des/cfb_enc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/libcrypto/des/cfb_enc.c')

diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index 94ef35878f..b8c510067c 100644
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ b/src/lib/libcrypto/des/cfb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb_enc.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cfb_enc.c,v 1.11 2014/07/09 16:06:13 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -77,7 +77,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
 	register int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
 	DES_LONG ti[2];
 	unsigned char *iv;
-#if _BYTE_ORDER != _LITTLE_ENDIAN
+#if BYTE_ORDER != LITTLE_ENDIAN
 	unsigned char ovec[16];
 #else
 	unsigned int  sh[4];
@@ -115,7 +115,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
 				{ v0=d0; v1=d1; }
 			else
 				{
-#if _BYTE_ORDER != _LITTLE_ENDIAN
+#if BYTE_ORDER != LITTLE_ENDIAN
 				iv=&ovec[0];
 				l2c(v0,iv);
 				l2c(v1,iv);
@@ -130,7 +130,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
 					for(i=0 ; i < 8 ; ++i)
 						ovec[i]=ovec[i+num]<<rem |
 							ovec[i+num+1]>>(8-rem);
-#if _BYTE_ORDER == _LITTLE_ENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 				v0=sh[0], v1=sh[1];
 #else
 				iv=&ovec[0];
@@ -158,7 +158,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
 				{ v0=d0; v1=d1; }
 			else
 				{
-#if _BYTE_ORDER != _LITTLE_ENDIAN
+#if BYTE_ORDER != LITTLE_ENDIAN
 				iv=&ovec[0];
 				l2c(v0,iv);
 				l2c(v1,iv);
@@ -173,7 +173,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
 					for(i=0 ; i < 8 ; ++i)
 						ovec[i]=ovec[i+num]<<rem |
 							ovec[i+num+1]>>(8-rem);
-#if _BYTE_ORDER == _LITTLE_ENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
 				v0=sh[0], v1=sh[1];
 #else
 				iv=&ovec[0];
-- 
cgit v1.2.3-55-g6feb