Pedro Monreal Gonzalez
30c6de24df
* Miscellaneous minor bug fixes.
* The FIPS provider now performs a PCT on key import for RSA, EC and ECX.
This is mandated by FIPS 140-3 IG 10.3.A additional comment 1.
- Rebase patches:
* openssl-FIPS-140-3-keychecks.patch
* openssl-FIPS-NO-DES-support.patch
* openssl-FIPS-enforce-EMS-support.patch
* openssl-disable-fipsinstall.patch
- Move ssl configuration files to the libopenssl package [bsc#1247463]
- Don't install unneeded NOTES
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=153
74 lines
3.1 KiB
Diff
74 lines
3.1 KiB
Diff
From e128762a1b1f047633e76022a6a8097cb88b49a6 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Belyavskiy <beldmit@gmail.com>
|
|
Date: Fri, 9 May 2025 15:09:46 +0200
|
|
Subject: [PATCH 51/54] Make `openssl speed` run in FIPS mode
|
|
|
|
---
|
|
apps/speed.c | 44 ++++++++++++++++++++++----------------------
|
|
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
Index: openssl-3.5.0/apps/speed.c
|
|
===================================================================
|
|
--- openssl-3.5.0.orig/apps/speed.c
|
|
+++ openssl-3.5.0/apps/speed.c
|
|
@@ -3172,18 +3172,18 @@ int speed_main(int argc, char **argv)
|
|
(void *)key32, 16);
|
|
params[1] = OSSL_PARAM_construct_end();
|
|
|
|
- if (mac_setup("KMAC-128", &mac, params, loopargs, loopargs_len) < 1)
|
|
- goto end;
|
|
- for (testnum = 0; testnum < size_num; testnum++) {
|
|
- print_message(names[D_KMAC128], lengths[testnum], seconds.sym);
|
|
- Time_F(START);
|
|
- count = run_benchmark(async_jobs, KMAC128_loop, loopargs);
|
|
- d = Time_F(STOP);
|
|
- print_result(D_KMAC128, testnum, count, d);
|
|
- if (count < 0)
|
|
- break;
|
|
+ if (mac_setup("KMAC-128", &mac, params, loopargs, loopargs_len) == 1) {
|
|
+ for (testnum = 0; testnum < size_num; testnum++) {
|
|
+ print_message(names[D_KMAC128], lengths[testnum], seconds.sym);
|
|
+ Time_F(START);
|
|
+ count = run_benchmark(async_jobs, KMAC128_loop, loopargs);
|
|
+ d = Time_F(STOP);
|
|
+ print_result(D_KMAC128, testnum, count, d);
|
|
+ if (count < 0)
|
|
+ break;
|
|
+ }
|
|
+ mac_teardown(&mac, loopargs, loopargs_len);
|
|
}
|
|
- mac_teardown(&mac, loopargs, loopargs_len);
|
|
}
|
|
|
|
if (doit[D_KMAC256]) {
|
|
@@ -3193,18 +3193,18 @@ int speed_main(int argc, char **argv)
|
|
(void *)key32, 32);
|
|
params[1] = OSSL_PARAM_construct_end();
|
|
|
|
- if (mac_setup("KMAC-256", &mac, params, loopargs, loopargs_len) < 1)
|
|
- goto end;
|
|
- for (testnum = 0; testnum < size_num; testnum++) {
|
|
- print_message(names[D_KMAC256], lengths[testnum], seconds.sym);
|
|
- Time_F(START);
|
|
- count = run_benchmark(async_jobs, KMAC256_loop, loopargs);
|
|
- d = Time_F(STOP);
|
|
- print_result(D_KMAC256, testnum, count, d);
|
|
- if (count < 0)
|
|
- break;
|
|
+ if (mac_setup("KMAC-256", &mac, params, loopargs, loopargs_len) == 1) {
|
|
+ for (testnum = 0; testnum < size_num; testnum++) {
|
|
+ print_message(names[D_KMAC256], lengths[testnum], seconds.sym);
|
|
+ Time_F(START);
|
|
+ count = run_benchmark(async_jobs, KMAC256_loop, loopargs);
|
|
+ d = Time_F(STOP);
|
|
+ print_result(D_KMAC256, testnum, count, d);
|
|
+ if (count < 0)
|
|
+ break;
|
|
+ }
|
|
+ mac_teardown(&mac, loopargs, loopargs_len);
|
|
}
|
|
- mac_teardown(&mac, loopargs, loopargs_len);
|
|
}
|
|
|
|
for (i = 0; i < loopargs_len; i++)
|