From b6c209be6caef097e921bb683417160e1c6f41c0 Mon Sep 17 00:00:00 2001
From: bcook <bcook@openbsd.org>
Date: Tue, 9 Nov 2021 18:40:20 +0000
Subject: [PATCH] Switch to <endian.h> from <machine/endian.h> for better
 portability.

ok tb@
---
 lib/libcrypto/bn/bn_nist.c        | 5 ++---
 lib/libcrypto/des/cfb_enc.c       | 4 ++--
 lib/libcrypto/gost/gost2814789.c  | 5 ++---
 lib/libcrypto/gost/streebog.c     | 5 ++---
 lib/libcrypto/modes/modes_lcl.h   | 4 ++--
 lib/libcrypto/modes/xts128.c      | 5 +++--
 lib/libcrypto/rc4/rc4_enc.c       | 5 +++--
 lib/libcrypto/sha/sha256.c        | 5 ++---
 lib/libcrypto/sha/sha512.c        | 5 ++---
 lib/libcrypto/sha/sha_locl.h      | 4 ++--
 lib/libcrypto/whrlpool/wp_block.c | 4 ++--
 lib/libssl/d1_pkt.c               | 5 ++---
 12 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/lib/libcrypto/bn/bn_nist.c b/lib/libcrypto/bn/bn_nist.c
index b16584d6b97..3a04c471c41 100644
--- a/lib/libcrypto/bn/bn_nist.c
+++ b/lib/libcrypto/bn/bn_nist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_nist.c,v 1.18 2016/07/18 01:04:52 bcook Exp $ */
+/* $OpenBSD: bn_nist.c,v 1.19 2021/11/09 18:40:20 bcook Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -56,8 +56,7 @@
  *
  */
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/libcrypto/des/cfb_enc.c b/lib/libcrypto/des/cfb_enc.c
index 59a3e718622..4231f469ee7 100644
--- a/lib/libcrypto/des/cfb_enc.c
+++ b/lib/libcrypto/des/cfb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb_enc.c,v 1.13 2015/02/10 09:46:30 miod Exp $ */
+/* $OpenBSD: cfb_enc.c,v 1.14 2021/11/09 18:40:21 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,7 +57,7 @@
  */
 
 #include "des_locl.h"
-#include <machine/endian.h>
+#include <endian.h>
 
 /* The input and output are loaded in multiples of 8 bits.
  * What this means is that if you hame numbits=12 and length=2
diff --git a/lib/libcrypto/gost/gost2814789.c b/lib/libcrypto/gost/gost2814789.c
index f1066f24678..0841a03b1e5 100644
--- a/lib/libcrypto/gost/gost2814789.c
+++ b/lib/libcrypto/gost/gost2814789.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost2814789.c,v 1.6 2020/09/12 02:45:05 inoguchi Exp $ */
+/* $OpenBSD: gost2814789.c,v 1.7 2021/11/09 18:40:21 bcook Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -49,8 +49,7 @@
  * ====================================================================
  */
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <string.h>
 
 #include <openssl/opensslconf.h>
diff --git a/lib/libcrypto/gost/streebog.c b/lib/libcrypto/gost/streebog.c
index 61bce0e32cd..b237a2c5006 100644
--- a/lib/libcrypto/gost/streebog.c
+++ b/lib/libcrypto/gost/streebog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: streebog.c,v 1.6 2019/05/09 22:54:28 tb Exp $ */
+/* $OpenBSD: streebog.c,v 1.7 2021/11/09 18:40:21 bcook Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -49,8 +49,7 @@
  * ====================================================================
  */
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libcrypto/modes/modes_lcl.h b/lib/libcrypto/modes/modes_lcl.h
index f8830e4deba..91820897f7c 100644
--- a/lib/libcrypto/modes/modes_lcl.h
+++ b/lib/libcrypto/modes/modes_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes_lcl.h,v 1.10 2016/12/21 15:49:29 jsing Exp $ */
+/* $OpenBSD: modes_lcl.h,v 1.11 2021/11/09 18:40:21 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -6,7 +6,7 @@
  * ====================================================================
  */
 
-#include <machine/endian.h>
+#include <endian.h>
 
 #include <openssl/opensslconf.h>
 
diff --git a/lib/libcrypto/modes/xts128.c b/lib/libcrypto/modes/xts128.c
index 0be23d4ea97..2084892ee65 100644
--- a/lib/libcrypto/modes/xts128.c
+++ b/lib/libcrypto/modes/xts128.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xts128.c,v 1.7 2017/08/13 17:46:24 bcook Exp $ */
+/* $OpenBSD: xts128.c,v 1.8 2021/11/09 18:40:21 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
@@ -48,9 +48,10 @@
  * ====================================================================
  */
 
-#include <machine/endian.h>
 #include <openssl/crypto.h>
 #include "modes_lcl.h"
+
+#include <endian.h>
 #include <string.h>
 
 #ifndef MODES_DEBUG
diff --git a/lib/libcrypto/rc4/rc4_enc.c b/lib/libcrypto/rc4/rc4_enc.c
index bd928b58c99..aa2766a1336 100644
--- a/lib/libcrypto/rc4/rc4_enc.c
+++ b/lib/libcrypto/rc4/rc4_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_enc.c,v 1.16 2017/08/13 17:46:24 bcook Exp $ */
+/* $OpenBSD: rc4_enc.c,v 1.17 2021/11/09 18:40:21 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-#include <machine/endian.h>
+#include <endian.h>
+
 #include <openssl/rc4.h>
 #include "rc4_locl.h"
 
diff --git a/lib/libcrypto/sha/sha256.c b/lib/libcrypto/sha/sha256.c
index 9c05d3b0f83..e826ca9e194 100644
--- a/lib/libcrypto/sha/sha256.c
+++ b/lib/libcrypto/sha/sha256.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha256.c,v 1.10 2019/01/21 23:20:31 jsg Exp $ */
+/* $OpenBSD: sha256.c,v 1.11 2021/11/09 18:40:21 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved
  * according to the OpenSSL license [found in ../../LICENSE].
@@ -9,8 +9,7 @@
 
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256)
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libcrypto/sha/sha512.c b/lib/libcrypto/sha/sha512.c
index 6b95cfa72e1..56a207f7d02 100644
--- a/lib/libcrypto/sha/sha512.c
+++ b/lib/libcrypto/sha/sha512.c
@@ -1,12 +1,11 @@
-/* $OpenBSD: sha512.c,v 1.15 2016/11/04 13:56:05 miod Exp $ */
+/* $OpenBSD: sha512.c,v 1.16 2021/11/09 18:40:21 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved
  * according to the OpenSSL license [found in ../../LICENSE].
  * ====================================================================
  */
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libcrypto/sha/sha_locl.h b/lib/libcrypto/sha/sha_locl.h
index 46c9a39be2f..5daab29fd7d 100644
--- a/lib/libcrypto/sha/sha_locl.h
+++ b/lib/libcrypto/sha/sha_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha_locl.h,v 1.23 2016/12/23 23:22:25 patrick Exp $ */
+/* $OpenBSD: sha_locl.h,v 1.24 2021/11/09 18:40:21 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -186,7 +186,7 @@ int SHA1_Init(SHA_CTX *c)
 #endif
 
 #if !defined(SHA1_ASM)
-#include <machine/endian.h>
+#include <endian.h>
 static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
 	{
 	const unsigned char *data=p;
diff --git a/lib/libcrypto/whrlpool/wp_block.c b/lib/libcrypto/whrlpool/wp_block.c
index 1e00a013304..b2137d643d2 100644
--- a/lib/libcrypto/whrlpool/wp_block.c
+++ b/lib/libcrypto/whrlpool/wp_block.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wp_block.c,v 1.13 2016/11/04 17:30:30 miod Exp $ */
+/* $OpenBSD: wp_block.c,v 1.14 2021/11/09 18:40:21 bcook Exp $ */
 /**
  * The Whirlpool hashing function.
  *
@@ -36,9 +36,9 @@
  *
  */
 
+#include <endian.h>
 #include <string.h>
 #include <openssl/crypto.h>
-#include <machine/endian.h>
 
 #include "wp_locl.h"
 
diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c
index f0f393b0fd3..12a711324ab 100644
--- a/lib/libssl/d1_pkt.c
+++ b/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.115 2021/10/25 10:14:48 jsing Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.116 2021/11/09 18:40:21 bcook Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -113,8 +113,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include <machine/endian.h>
-
+#include <endian.h>
 #include <errno.h>
 #include <stdio.h>
 
-- 
2.20.1