From 3619e99136e45a9b10d78b643bae51a9a1b8e1c9 Mon Sep 17 00:00:00 2001
From: joshua <>
Date: Sat, 24 May 2025 08:04:21 +0000
Subject: openssl speed: move key{16,24,32} above speed_main

Also, reuse the same keys for Camellia instead of having duplicates.

ok jsing tb
---
 src/usr.bin/openssl/speed.c | 58 +++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index cde8f05db7..0254c03062 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.42 2025/05/24 02:03:02 joshua Exp $ */
+/* $OpenBSD: speed.c,v 1.43 2025/05/24 08:04:21 joshua Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -895,6 +895,28 @@ static const unsigned char test4096[] = {
 	0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
 };
 
+static const unsigned char key16[] = {
+	0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+	0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+};
+static const unsigned char key24[] = {
+	0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+	0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+	0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
+};
+static const unsigned char key32[] = {
+	0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
+	0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
+	0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
+	0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56,
+};
+
+#ifndef OPENSSL_NO_AES
+#define MAX_BLOCK_SIZE 128
+#else
+#define MAX_BLOCK_SIZE 64
+#endif
+
 static void
 sig_done(int sig)
 {
@@ -957,36 +979,6 @@ speed_main(int argc, char **argv)
 #endif
 #ifndef OPENSSL_NO_CAST
 	CAST_KEY cast_ks;
-#endif
-	static const unsigned char key16[16] =
-	{0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-	0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12};
-#ifndef OPENSSL_NO_AES
-	static const unsigned char key24[24] =
-	{0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-		0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-	0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34};
-	static const unsigned char key32[32] =
-	{0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-		0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-		0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
-	0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56};
-#endif
-#ifndef OPENSSL_NO_CAMELLIA
-	static const unsigned char ckey24[24] =
-	{0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-		0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-	0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34};
-	static const unsigned char ckey32[32] =
-	{0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
-		0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
-		0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
-	0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56};
-#endif
-#ifndef OPENSSL_NO_AES
-#define MAX_BLOCK_SIZE 128
-#else
-#define MAX_BLOCK_SIZE 64
 #endif
 	unsigned char DES_iv[8];
 	unsigned char iv[2 * MAX_BLOCK_SIZE / 8];
@@ -1581,8 +1573,8 @@ speed_main(int argc, char **argv)
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 	Camellia_set_key(key16, 128, &camellia_ks1);
-	Camellia_set_key(ckey24, 192, &camellia_ks2);
-	Camellia_set_key(ckey32, 256, &camellia_ks3);
+	Camellia_set_key(key24, 192, &camellia_ks2);
+	Camellia_set_key(key32, 256, &camellia_ks3);
 #endif
 #ifndef OPENSSL_NO_IDEA
 	idea_set_encrypt_key(key16, &idea_ks);
-- 
cgit v1.2.3-55-g6feb