From ae39aee525d96fbbd51414059566425e57a8d3b7 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Mon, 4 Sep 2023 08:43:41 +0000
Subject: [PATCH] Make wp_local.h and cmll_local.h self-standing

---
 lib/libcrypto/camellia/cmll_ecb.c   | 5 ++---
 lib/libcrypto/camellia/cmll_local.h | 4 +++-
 lib/libcrypto/whrlpool/wp_dgst.c    | 8 ++++----
 lib/libcrypto/whrlpool/wp_local.h   | 4 +++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/libcrypto/camellia/cmll_ecb.c b/lib/libcrypto/camellia/cmll_ecb.c
index edac99023bc..0575d29e296 100644
--- a/lib/libcrypto/camellia/cmll_ecb.c
+++ b/lib/libcrypto/camellia/cmll_ecb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmll_ecb.c,v 1.6 2023/09/04 08:36:48 robert Exp $ */
+/* $OpenBSD: cmll_ecb.c,v 1.7 2023/09/04 08:43:41 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -49,9 +49,8 @@
  *
  */
 
-#include <sys/types.h>
-
 #include <openssl/camellia.h>
+
 #include "cmll_local.h"
 
 void
diff --git a/lib/libcrypto/camellia/cmll_local.h b/lib/libcrypto/camellia/cmll_local.h
index ed9807c069d..831625e776f 100644
--- a/lib/libcrypto/camellia/cmll_local.h
+++ b/lib/libcrypto/camellia/cmll_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmll_local.h,v 1.2 2022/11/26 17:23:17 tb Exp $ */
+/* $OpenBSD: cmll_local.h,v 1.3 2023/09/04 08:43:41 tb Exp $ */
 /* ====================================================================
  * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
  * ALL RIGHTS RESERVED.
@@ -68,6 +68,8 @@
 #ifndef HEADER_CAMELLIA_LOCAL_H
 #define HEADER_CAMELLIA_LOCAL_H
 
+#include <sys/types.h>
+
 __BEGIN_HIDDEN_DECLS
 
 typedef unsigned int  u32;
diff --git a/lib/libcrypto/whrlpool/wp_dgst.c b/lib/libcrypto/whrlpool/wp_dgst.c
index 282679e7d1f..71fd79c8404 100644
--- a/lib/libcrypto/whrlpool/wp_dgst.c
+++ b/lib/libcrypto/whrlpool/wp_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wp_dgst.c,v 1.6 2023/09/04 08:36:48 robert Exp $ */
+/* $OpenBSD: wp_dgst.c,v 1.7 2023/09/04 08:43:41 tb Exp $ */
 /**
  * The Whirlpool hashing function.
  *
@@ -52,11 +52,11 @@
  * input. This is done for performance.
  */
 
-#include <sys/types.h>
+#include <string.h>
 
-#include "wp_local.h"
 #include <openssl/crypto.h>
-#include <string.h>
+
+#include "wp_local.h"
 
 int WHIRLPOOL_Init(WHIRLPOOL_CTX *c)
 	{
diff --git a/lib/libcrypto/whrlpool/wp_local.h b/lib/libcrypto/whrlpool/wp_local.h
index 2d3bc9c6eca..892dce23b67 100644
--- a/lib/libcrypto/whrlpool/wp_local.h
+++ b/lib/libcrypto/whrlpool/wp_local.h
@@ -1,4 +1,6 @@
-/* $OpenBSD: wp_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: wp_local.h,v 1.2 2023/09/04 08:43:41 tb Exp $ */
+
+#include <sys/types.h>
 
 #include <openssl/whrlpool.h>
 
-- 
2.20.1