From 6f61591b2964469ec808d7699dd75a970212dc8d Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Wed, 24 May 2023 15:55:02 +0100
Subject: [PATCH] Add a performance test for EVP_PKEY_new_raw_public_key_ex()

We add a performance test for repeatedly calling
EVP_PKEY_new_raw_public_key_ex(). Note this test does not support 1.1.1.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/149)
---
 perf/Makefile    |  7 ++--
 perf/README      | 11 ++++++
 perf/newrawkey.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 perf/newrawkey.c

diff --git a/perf/Makefile b/perf/Makefile
index 6b2514a..599b810 100644
--- a/perf/Makefile
+++ b/perf/Makefile
@@ -1,7 +1,7 @@
-all: randbytes handshake sslnew
+all: randbytes handshake sslnew newrawkey
 
 clean:
-	rm libperf.a *.o randbytes handshake sslnew
+	rm libperf.a *.o randbytes handshake sslnew newrawkey
 
 libperf.a: perflib/*.c perflib/*.h
 	gcc -I$(TARGET_OSSL_INCLUDE_PATH) -I. -c perflib/*.c
@@ -15,3 +15,6 @@ handshake: handshake.c libperf.a
 
 sslnew: sslnew.c libperf.a
 	gcc -L$(TARGET_OSSL_LIBRARY_PATH) -L. -I$(TARGET_OSSL_INCLUDE_PATH) -I. -o sslnew sslnew.c -lperf -lcrypto -lssl
+
+newrawkey:	newrawkey.c libperf.a
+	gcc -L$(TARGET_OSSL_LIBRARY_PATH) -L. -I$(TARGET_OSSL_INCLUDE_PATH) -I. -o newrawkey newrawkey.c -lperf -lcrypto
diff --git a/perf/README b/perf/README
index a039190..bb2ea8b 100644
--- a/perf/README
+++ b/perf/README
@@ -69,3 +69,14 @@ newly constructed read BIO and a newly constructed write BIO, and finally frees
 them again. It does this in blocks of 100 sets of calls, and 100 blocks per
 threads. The number of threads to use is provided as an argument and the test
 reports the average time taken to execute a block of 100 construction/free calls.
+
+newrawkey
+---------
+
+The newrawkey test repeatedly calls the EVP_PKEY_new_raw_public_key_ex()
+function in blocks of 100 calls, and 100 blocks per thread. The number of
+threads to use is provided as an argument and the test reports the average time
+take to execute a block of 100 EVP_PKEY_new_raw_public_key_ex() calls.
+
+Note that this test does not support OpenSSL 1.1.1.
+
diff --git a/perf/newrawkey.c b/perf/newrawkey.c
new file mode 100644
index 0000000..10115a3
--- /dev/null
+++ b/perf/newrawkey.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <openssl/evp.h>
+#include "perflib/perflib.h"
+
+#define NUM_CALLS_PER_BLOCK         100
+#define NUM_CALL_BLOCKS_PER_THREAD  100
+#define NUM_CALLS_PER_THREAD        (NUM_CALLS_PER_BLOCK * NUM_CALL_BLOCKS_PER_THREAD)
+
+int err = 0;
+
+static unsigned char buf[32] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
+    0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+};
+
+void do_newrawkey(size_t num)
+{
+    int i;
+    EVP_PKEY *pkey;
+
+    for (i = 0; i < NUM_CALLS_PER_THREAD; i++) {
+        pkey = EVP_PKEY_new_raw_public_key_ex(NULL, "X25519", NULL, buf,
+                                              sizeof(buf));
+        if (pkey == NULL)
+            err = 1;
+        else
+            EVP_PKEY_free(pkey);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    int threadcount;
+    OSSL_TIME duration;
+    uint64_t us;
+    double avcalltime;
+    int terse = 0;
+    int argnext;
+
+    if ((argc != 2 && argc != 3)
+                || (argc == 3 && strcmp("--terse", argv[1]) != 0)) {
+        printf("Usage: newrawkey [--terse] threadcount\n");
+        return EXIT_FAILURE;
+    }
+
+    if (argc == 3) {
+        terse = 1;
+        argnext = 2;
+    } else {
+        argnext = 1;
+    }
+
+    threadcount = atoi(argv[argnext]);
+    if (threadcount < 1) {
+        printf("threadcount must be > 0\n");
+        return EXIT_FAILURE;
+    }
+
+    if (!perflib_run_multi_thread_test(do_newrawkey, threadcount, &duration)) {
+        printf("Failed to run the test\n");
+        return EXIT_FAILURE;
+    }
+
+    if (err) {
+        printf("Error during test\n");
+        return EXIT_FAILURE;
+    }
+
+    us = ossl_time2us(duration);
+
+    avcalltime = (double)us / (NUM_CALL_BLOCKS_PER_THREAD * threadcount);
+
+    if (terse)
+        printf("%lf\n", avcalltime);
+    else
+        printf("Average time per %d EVP_PKEY_new_raw_public_key_ex() calls: %lfus\n",
+               NUM_CALLS_PER_BLOCK, avcalltime);
+
+    return EXIT_SUCCESS;
+}
-- 
2.34.1