From e3d56dc6366f84e44ef5b88f73a1439bfbf0c7ba Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Sun, 27 Jun 2021 17:45:16 +0000
Subject: [PATCH] Keep sigalg initialiser order consistent - key type, then
 hash.

This matches the order that sigalgs are specified in.

ok tb@
---
 lib/libssl/ssl_sigalgs.c | 36 ++++++++++++++++++------------------
 lib/libssl/ssl_sigalgs.h |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/libssl/ssl_sigalgs.c b/lib/libssl/ssl_sigalgs.c
index 2612d5ac1d8..17ac1f84ffe 100644
--- a/lib/libssl/ssl_sigalgs.c
+++ b/lib/libssl/ssl_sigalgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sigalgs.c,v 1.24 2021/05/16 08:24:21 jsing Exp $ */
+/* $OpenBSD: ssl_sigalgs.c,v 1.25 2021/06/27 17:45:16 jsing Exp $ */
 /*
  * Copyright (c) 2018-2020 Bob Beck <beck@openbsd.org>
  *
@@ -28,101 +28,101 @@
 const struct ssl_sigalg sigalgs[] = {
 	{
 		.value = SIGALG_RSA_PKCS1_SHA512,
-		.md = EVP_sha512,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha512,
 	},
 	{
 		.value = SIGALG_ECDSA_SECP521R1_SHA512,
-		.md = EVP_sha512,
 		.key_type = EVP_PKEY_EC,
+		.md = EVP_sha512,
 		.curve_nid = NID_secp521r1,
 	},
 #ifndef OPENSSL_NO_GOST
 	{
 		.value = SIGALG_GOSTR12_512_STREEBOG_512,
-		.md = EVP_streebog512,
 		.key_type = EVP_PKEY_GOSTR12_512,
+		.md = EVP_streebog512,
 	},
 #endif
 	{
 		.value = SIGALG_RSA_PKCS1_SHA384,
-		.md = EVP_sha384,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha384,
 	},
 	{
 		.value = SIGALG_ECDSA_SECP384R1_SHA384,
-		.md = EVP_sha384,
 		.key_type = EVP_PKEY_EC,
+		.md = EVP_sha384,
 		.curve_nid = NID_secp384r1,
 	},
 	{
 		.value = SIGALG_RSA_PKCS1_SHA256,
-		.md = EVP_sha256,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha256,
 	},
 	{
 		.value = SIGALG_ECDSA_SECP256R1_SHA256,
-		.md = EVP_sha256,
 		.key_type = EVP_PKEY_EC,
+		.md = EVP_sha256,
 		.curve_nid = NID_X9_62_prime256v1,
 	},
 #ifndef OPENSSL_NO_GOST
 	{
 		.value = SIGALG_GOSTR12_256_STREEBOG_256,
-		.md = EVP_streebog256,
 		.key_type = EVP_PKEY_GOSTR12_256,
+		.md = EVP_streebog256,
 	},
 	{
 		.value = SIGALG_GOSTR01_GOST94,
-		.md = EVP_gostr341194,
 		.key_type = EVP_PKEY_GOSTR01,
+		.md = EVP_gostr341194,
 	},
 #endif
 	{
 		.value = SIGALG_RSA_PSS_RSAE_SHA256,
-		.md = EVP_sha256,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha256,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PSS_RSAE_SHA384,
-		.md = EVP_sha384,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha384,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PSS_RSAE_SHA512,
-		.md = EVP_sha512,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha512,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PSS_PSS_SHA256,
-		.md = EVP_sha256,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha256,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PSS_PSS_SHA384,
-		.md = EVP_sha384,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha384,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PSS_PSS_SHA512,
-		.md = EVP_sha512,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha512,
 		.flags = SIGALG_FLAG_RSA_PSS,
 	},
 	{
 		.value = SIGALG_RSA_PKCS1_SHA224,
-		.md = EVP_sha224,
 		.key_type = EVP_PKEY_RSA,
+		.md = EVP_sha224,
 	},
 	{
 		.value = SIGALG_ECDSA_SECP224R1_SHA224,
-		.md = EVP_sha224,
 		.key_type = EVP_PKEY_EC,
+		.md = EVP_sha224,
 	},
 	{
 		.value = SIGALG_RSA_PKCS1_SHA1,
diff --git a/lib/libssl/ssl_sigalgs.h b/lib/libssl/ssl_sigalgs.h
index a205fe97aae..db21eda1f8b 100644
--- a/lib/libssl/ssl_sigalgs.h
+++ b/lib/libssl/ssl_sigalgs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sigalgs.h,v 1.16 2021/05/16 13:39:07 jsing Exp $ */
+/* $OpenBSD: ssl_sigalgs.h,v 1.17 2021/06/27 17:45:16 jsing Exp $ */
 /*
  * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org>
  *
@@ -62,8 +62,8 @@ __BEGIN_HIDDEN_DECLS
 
 struct ssl_sigalg {
 	uint16_t value;
-	const EVP_MD *(*md)(void);
 	int key_type;
+	const EVP_MD *(*md)(void);
 	int curve_nid;
 	int flags;
 };
-- 
2.20.1