Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
19a45b8d
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
19a45b8d
编写于
14年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid use of ex_data free function in Chil ENGINE so it can be safely
reloaded.
上级
07e29c12
master
OpenHarmony-2.2-Beta2
OpenHarmony-2.3-Beta
OpenHarmony-3.0-LTS
OpenHarmony-3.1-API8-SDK-Public
OpenHarmony-3.1-API9-SDK-Canary
OpenHarmony-3.1-Beta
OpenHarmony-3.1-Release
OpenHarmony-3.2-Beta1
OpenHarmony-3.2-Beta2
OpenHarmony-3.2-Beta3
OpenHarmony-3.2-Beta4
OpenHarmony-3.2-Beta5
OpenHarmony-3.2-Release
OpenHarmony-4.0-Beta1
OpenHarmony-4.0-Beta2
OpenHarmony-v2.2-Beta
OpenHarmony_1.0.1_release
OpenHarmony_filemanager_develop_20220505
OpenHarmony_filemanager_develop_20220614
add_issus_pr_template_for_master
add_issus_pr_template_for_release
feature_IDL_20220811
master_dy
monthly_20220614
monthly_20220816
monthly_20221018
monthly_20230815
revert-merge-109-master
weekly_20220105
weekly_20220111
weekly_20220118
weekly_20220125
weekly_20220201
weekly_20220208
weekly_20220215
weekly_20220222
weekly_20220301
weekly_20220406
weekly_20220412
weekly_20220419
weekly_20220426
weekly_20220503
weekly_20220510
weekly_20220524
weekly_20220531
weekly_20220607
weekly_20220614
weekly_20220621
weekly_20220628
weekly_20220705
weekly_20220712
weekly_20220719
weekly_20220726
weekly_20220802
weekly_20220809
weekly_20220816
weekly_20220823
weekly_20220830
weekly_20220906
weekly_20220913
weekly_20220920
weekly_20220927
weekly_20221004
weekly_20221011
weekly_20221018
weekly_20221025
weekly_20221101
weekly_20221108
weekly_20221115
weekly_20221122
weekly_20221129
weekly_20221206
weekly_20221213
weekly_20221220
weekly_20221227
weekly_20230103
weekly_20230110
weekly_20230117
weekly_20230124
weekly_20230131
weekly_20230207
weekly_20230214
weekly_20230221
weekly_20230228
weekly_20230307
weekly_20230314
weekly_20230321
weekly_20230328
weekly_20230404
weekly_20230411
weekly_20230418
weekly_20230425
weekly_20230502
weekly_20230509
weekly_20230516
weekly_20230523
weekly_20230530
weekly_20230606
weekly_20230613
weekly_20230619
weekly_20230626
weekly_20230627
weekly_20230704
weekly_20230712
weekly_20230725
weekly_20230801
weekly_20230808
weekly_20230815
weekly_20230822
weekly_20230829
OpenHarmony_v1.1.1-LTS
OpenHarmony_release_v1.1.0
OpenHarmony-v4.0-Beta2
OpenHarmony-v4.0-Beta1
OpenHarmony-v3.2.2-Release
OpenHarmony-v3.2.1-Release
OpenHarmony-v3.2-Release
OpenHarmony-v3.2-Beta5
OpenHarmony-v3.2-Beta4
OpenHarmony-v3.2-Beta3
OpenHarmony-v3.2-Beta2
OpenHarmony-v3.2-Beta1
OpenHarmony-v3.1.7-Release
OpenHarmony-v3.1.6-Release
OpenHarmony-v3.1.5-Release
OpenHarmony-v3.1.4-Release
OpenHarmony-v3.1.3-Release
OpenHarmony-v3.1.2-Release
OpenHarmony-v3.1.1-Release
OpenHarmony-v3.1-Release
OpenHarmony-v3.1-Beta
OpenHarmony-v3.0.8-LTS
OpenHarmony-v3.0.7-LTS
OpenHarmony-v3.0.6-LTS
OpenHarmony-v3.0.5-LTS
OpenHarmony-v3.0.3-LTS
OpenHarmony-v3.0.2-LTS
OpenHarmony-v3.0.1-LTS
OpenHarmony-v3.0-LTS
OpenHarmony-v3.0-Beta1
OpenHarmony-v2.2-Beta2
OpenHarmony-v1.1.5-LTS
OpenHarmony-v1.1.4-LTS
OpenHarmony-v1.1.3-LTS
OpenHarmony-v1.1.2-LTS
OpenHarmony-v1.1.1-LTS
OpenHarmony-2.0-Canary
OpenHarmony-1.0
无相关合并请求
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
36 deletion
+18
-36
engines/e_chil.c
engines/e_chil.c
+18
-36
未找到文件。
engines/e_chil.c
浏览文件 @
19a45b8d
...
...
@@ -111,11 +111,10 @@ static int hwcrhk_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
#ifndef OPENSSL_NO_RSA
/* RSA stuff */
static
int
hwcrhk_rsa_mod_exp
(
BIGNUM
*
r
,
const
BIGNUM
*
I
,
RSA
*
rsa
,
BN_CTX
*
ctx
);
#endif
#ifndef OPENSSL_NO_RSA
/* This function is aliased to mod_exp (with the mont stuff dropped). */
static
int
hwcrhk_mod_exp_mont
(
BIGNUM
*
r
,
const
BIGNUM
*
a
,
const
BIGNUM
*
p
,
const
BIGNUM
*
m
,
BN_CTX
*
ctx
,
BN_MONT_CTX
*
m_ctx
);
static
int
hwcrhk_rsa_finish
(
RSA
*
rsa
);
#endif
#ifndef OPENSSL_NO_DH
...
...
@@ -135,10 +134,6 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
UI_METHOD
*
ui_method
,
void
*
callback_data
);
static
EVP_PKEY
*
hwcrhk_load_pubkey
(
ENGINE
*
eng
,
const
char
*
key_id
,
UI_METHOD
*
ui_method
,
void
*
callback_data
);
#ifndef OPENSSL_NO_RSA
static
void
hwcrhk_ex_free
(
void
*
obj
,
void
*
item
,
CRYPTO_EX_DATA
*
ad
,
int
ind
,
long
argl
,
void
*
argp
);
#endif
/* Interaction stuff */
static
int
hwcrhk_insert_card
(
const
char
*
prompt_info
,
...
...
@@ -193,7 +188,7 @@ static RSA_METHOD hwcrhk_rsa =
hwcrhk_rsa_mod_exp
,
hwcrhk_mod_exp_mont
,
NULL
,
NULL
,
hwcrhk_rsa_finish
,
0
,
NULL
,
NULL
,
...
...
@@ -602,7 +597,7 @@ static int hwcrhk_init(ENGINE *e)
if
(
hndidx_rsa
==
-
1
)
hndidx_rsa
=
RSA_get_ex_new_index
(
0
,
"nFast HWCryptoHook RSA key handle"
,
NULL
,
NULL
,
hwcrhk_ex_free
);
NULL
,
NULL
,
NULL
);
#endif
return
1
;
err:
...
...
@@ -1078,6 +1073,21 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
{
return
hwcrhk_mod_exp
(
r
,
a
,
p
,
m
,
ctx
);
}
static
int
hwcrhk_rsa_finish
(
RSA
*
rsa
)
{
HWCryptoHook_RSAKeyHandle
*
hptr
;
int
ret
;
hptr
=
RSA_get_ex_data
(
rsa
,
hndidx_rsa
);
if
(
hptr
)
{
ret
=
p_hwcrhk_RSAUnloadKey
(
*
hptr
,
NULL
);
OPENSSL_free
(
hptr
);
RSA_set_ex_data
(
rsa
,
hndidx_rsa
,
NULL
);
}
return
1
;
}
#endif
#ifndef OPENSSL_NO_DH
...
...
@@ -1136,34 +1146,6 @@ static int hwcrhk_rand_status(void)
return
1
;
}
/* This cleans up an RSA KM key, called when ex_data is freed */
#ifndef OPENSSL_NO_RSA
static
void
hwcrhk_ex_free
(
void
*
obj
,
void
*
item
,
CRYPTO_EX_DATA
*
ad
,
int
ind
,
long
argl
,
void
*
argp
)
{
char
tempbuf
[
1024
];
HWCryptoHook_ErrMsgBuf
rmsg
;
#ifndef OPENSSL_NO_RSA
HWCryptoHook_RSAKeyHandle
*
hptr
;
#endif
#if !defined(OPENSSL_NO_RSA)
int
ret
;
#endif
rmsg
.
buf
=
tempbuf
;
rmsg
.
size
=
sizeof
(
tempbuf
);
#ifndef OPENSSL_NO_RSA
hptr
=
(
HWCryptoHook_RSAKeyHandle
*
)
item
;
if
(
hptr
)
{
ret
=
p_hwcrhk_RSAUnloadKey
(
*
hptr
,
NULL
);
OPENSSL_free
(
hptr
);
}
#endif
}
#endif
/* Mutex calls: since the HWCryptoHook model closely follows the POSIX model
* these just wrap the POSIX functions and add some logging.
*/
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部