From 65e4977585c50d52eefa76b2f84329467dcef268 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Fri, 29 Dec 2023 07:22:47 +0000
Subject: [PATCH] Move the EVP_MD block size accessor down

This way all the EVP_MD accessors are in the order of the struct fields.
Well, arguably the EVP_MD_meth* should come first, but they are scheduled
to go meet the dodo.
---
 lib/libcrypto/evp/evp_digest.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/libcrypto/evp/evp_digest.c b/lib/libcrypto/evp/evp_digest.c
index 0f99cba2686..166b045625f 100644
--- a/lib/libcrypto/evp/evp_digest.c
+++ b/lib/libcrypto/evp/evp_digest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_digest.c,v 1.6 2023/12/29 07:14:02 tb Exp $ */
+/* $OpenBSD: evp_digest.c,v 1.7 2023/12/29 07:22:47 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -429,12 +429,6 @@ EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
 	}
 }
 
-int
-EVP_MD_block_size(const EVP_MD *md)
-{
-	return md->block_size;
-}
-
 int
 EVP_MD_type(const EVP_MD *md)
 {
@@ -463,6 +457,16 @@ EVP_MD_flags(const EVP_MD *md)
 	return md->flags;
 }
 
+int
+EVP_MD_block_size(const EVP_MD *md)
+{
+	return md->block_size;
+}
+
+/*
+ * XXX - remove everything below in the next bump.
+ */
+
 EVP_MD *
 EVP_MD_meth_new(int md_type, int pkey_type)
 {
-- 
2.20.1