95a99bb0f2
This series backport upstream 8 patches, it also fix spec file error by removing wrong changelog and fixing wrong date. Signed-off-by: Zhao Mengmeng <zhaomengmeng@kylinos.cn>
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From 43304e09b57473e3925457612d37a321e61fc39c Mon Sep 17 00:00:00 2001
|
|
From: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
Date: Mon, 6 May 2024 14:54:21 +0000
|
|
Subject: [PATCH 10/15] kmgmt: KEYMGMT struct is different in 3.2
|
|
|
|
KEYMGMT struct is different in 3.2 causes Segmentation fault.
|
|
Fix it by adding version check.
|
|
|
|
$ openssl speed -provider uadk provider rsa1024
|
|
Segmentation fault(core dumped)
|
|
|
|
$ openssl version
|
|
OpenssL 3.2.0-dev (Library: OpenssL 3.2.0-dev)
|
|
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
---
|
|
src/uadk_prov_dh.c | 2 ++
|
|
src/uadk_prov_rsa.c | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/src/uadk_prov_dh.c b/src/uadk_prov_dh.c
|
|
index 5437c46..c0adc2b 100644
|
|
--- a/src/uadk_prov_dh.c
|
|
+++ b/src/uadk_prov_dh.c
|
|
@@ -248,7 +248,9 @@ typedef struct {
|
|
OSSL_PROVIDER *prov;
|
|
|
|
int refcnt;
|
|
+# if OPENSSL_VERSION_NUMBER < 0x30200000
|
|
void *lock;
|
|
+# endif
|
|
|
|
/* Constructor(s), destructor, information */
|
|
OSSL_FUNC_keymgmt_new_fn *new;
|
|
diff --git a/src/uadk_prov_rsa.c b/src/uadk_prov_rsa.c
|
|
index b60de0c..7918b51 100644
|
|
--- a/src/uadk_prov_rsa.c
|
|
+++ b/src/uadk_prov_rsa.c
|
|
@@ -299,7 +299,9 @@ typedef struct{
|
|
OSSL_PROVIDER *prov;
|
|
|
|
int refcnt;
|
|
+# if OPENSSL_VERSION_NUMBER < 0x30200000
|
|
void *lock;
|
|
+# endif
|
|
|
|
/* Constructor(s), destructor, information */
|
|
OSSL_FUNC_keymgmt_new_fn *new;
|
|
--
|
|
2.43.0
|
|
|