From 7e2b557a74882df8b710f53045f67999cef7d8be Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Tue, 18 Apr 2023 08:47:28 +0000
Subject: [PATCH] Bring includes into canonical order

Requested by jsing
---
 lib/libcrypto/asn1/asn1.h     |  4 ++--
 lib/libcrypto/dsa/dsa.h       |  8 ++++----
 lib/libcrypto/ecdsa/ecdsa.h   |  5 +++--
 lib/libcrypto/engine/engine.h | 16 ++++++++--------
 lib/libcrypto/rsa/rsa.h       |  5 +++--
 lib/libcrypto/x509/x509.h     | 34 +++++++++++++++-------------------
 6 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index 01bfcd31e0e..03d7a2939f6 100644
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.73 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.74 2023/04/18 08:47:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,11 +66,11 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
+#include <openssl/bn.h>
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
 
 #include <openssl/ossl_typ.h>
-#include <openssl/bn.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/lib/libcrypto/dsa/dsa.h b/lib/libcrypto/dsa/dsa.h
index 3d81dc6dec8..8029e7f94c4 100644
--- a/lib/libcrypto/dsa/dsa.h
+++ b/lib/libcrypto/dsa/dsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.h,v 1.42 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: dsa.h,v 1.43 2023/04/18 08:47:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -74,14 +74,14 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
-#include <openssl/crypto.h>
-#include <openssl/ossl_typ.h>
-
 #include <openssl/bn.h>
+#include <openssl/crypto.h>
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif
 
+#include <openssl/ossl_typ.h>
+
 #ifndef OPENSSL_DSA_MAX_MODULUS_BITS
 # define OPENSSL_DSA_MAX_MODULUS_BITS	10000
 #endif
diff --git a/lib/libcrypto/ecdsa/ecdsa.h b/lib/libcrypto/ecdsa/ecdsa.h
index d095ef40a39..6139dbac1a4 100644
--- a/lib/libcrypto/ecdsa/ecdsa.h
+++ b/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa.h,v 1.14 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: ecdsa.h,v 1.15 2023/04/18 08:47:28 tb Exp $ */
 /**
  * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
  * \author Written by Nils Larsch for the OpenSSL project
@@ -65,9 +65,10 @@
 #error ECDSA is disabled.
 #endif
 
+#include <openssl/bn.h>
 #include <openssl/ec.h>
+
 #include <openssl/ossl_typ.h>
-#include <openssl/bn.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h
index 8a3574fd575..51c6b633935 100644
--- a/lib/libcrypto/engine/engine.h
+++ b/lib/libcrypto/engine/engine.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.h,v 1.36 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: engine.h,v 1.37 2023/04/18 08:47:28 tb Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -71,14 +71,14 @@
 #endif
 
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
 #endif
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h>
 #endif
 #ifndef OPENSSL_NO_ECDH
 #include <openssl/ecdh.h>
@@ -86,11 +86,11 @@
 #ifndef OPENSSL_NO_ECDSA
 #include <openssl/ecdsa.h>
 #endif
-#ifndef OPENSSL_NO_EC
-#include <openssl/ec.h>
+#include <openssl/err.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
 #endif
 #include <openssl/ui.h>
-#include <openssl/err.h>
 
 #include <openssl/ossl_typ.h>
 
diff --git a/lib/libcrypto/rsa/rsa.h b/lib/libcrypto/rsa/rsa.h
index bf0aac647e7..cddd80bc856 100644
--- a/lib/libcrypto/rsa/rsa.h
+++ b/lib/libcrypto/rsa/rsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.h,v 1.61 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: rsa.h,v 1.62 2023/04/18 08:47:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,9 +66,10 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
+#include <openssl/bn.h>
 #include <openssl/crypto.h>
+
 #include <openssl/ossl_typ.h>
-#include <openssl/bn.h>
 
 #ifdef OPENSSL_NO_RSA
 #error RSA is disabled.
diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h
index ac14dd38683..9f87700c60f 100644
--- a/lib/libcrypto/x509/x509.h
+++ b/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.95 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.96 2023/04/18 08:47:28 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,44 +66,40 @@
 
 #include <openssl/opensslconf.h>
 
+#include <openssl/asn1.h>
+#ifndef OPENSSL_NO_BIO
+#include <openssl/bio.h>
+#endif
 #ifndef OPENSSL_NO_BUFFER
 #include <openssl/buffer.h>
 #endif
-#ifndef OPENSSL_NO_EVP
-#include <openssl/evp.h>
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
 #endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
 #endif
-#include <openssl/stack.h>
-#include <openssl/asn1.h>
-#include <openssl/safestack.h>
-
 #ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
 #endif
-
 #ifndef OPENSSL_NO_ECDSA
 #include <openssl/ecdsa.h>
 #endif
-
 #ifndef OPENSSL_NO_ECDH
 #include <openssl/ecdh.h>
 #endif
-
+#ifndef OPENSSL_NO_EVP
+#include <openssl/evp.h>
+#endif
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
+#include <openssl/stack.h>
+#include <openssl/safestack.h>
+
 #include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
-- 
2.20.1