Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
1a489c9a
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
8 个月 前同步成功
通知
8
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看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1a489c9a
编写于
9月 15, 2008
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
From branch OpenSSL_0_9_8-stable: Allow soft-loading engines.
Also, fix CHANGES (consistency with stable branch).
上级
8c864e54
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
15 deletion
+34
-15
CHANGES
CHANGES
+10
-12
apps/openssl.c
apps/openssl.c
+15
-3
crypto/engine/eng_cnf.c
crypto/engine/eng_cnf.c
+9
-0
未找到文件。
CHANGES
浏览文件 @
1a489c9a
...
...
@@ -703,13 +703,7 @@
*) Change 'Configure' script to enable Camellia by default.
[NTT]
*) Fix bug in X509_ATTRIBUTE creation: dont set attribute using
ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain
attribute creation routines such as certifcate requests and PKCS#12
files.
[Steve Henson]
Changes between 0.9.8h and 0.9.8i [xx XXX xxxx]
Changes between 0.9.8h and 0.9.8i [15 Sep 2008]
*) Fix a state transitition in s3_srvr.c and d1_srvr.c
(was using SSL3_ST_CW_CLNT_HELLO_B, should be ..._ST_SW_SRVR_...).
...
...
@@ -741,6 +735,10 @@
[Neel Mehta, Bodo Moeller]
*) Allow engines to be "soft loaded" - i.e. optionally don't die if
the load fails. Useful for distros.
[Ben Laurie and the FreeBSD team]
*) Add support for Local Machine Keyset attribute in PKCS#12 files.
[Steve Henson]
...
...
@@ -759,11 +757,11 @@
This work was sponsored by Logica.
[Steve Henson]
>>> Note: this change doesn't apply to the 0.9.9-dev branch (yet).
*) Allow engines to be "soft loaded" - i.e. optionally don't die if
the load fails. Useful for distros.
[Ben Laurie and the FreeBSD team]
<<<
*) Fix bug in X509_ATTRIBUTE creation: dont set attribute using
ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain
attribute creation routines such as certifcate requests and PKCS#12
files.
[Steve Henson]
Changes between 0.9.8g and 0.9.8h [28 May 2008]
...
...
apps/openssl.c
浏览文件 @
1a489c9a
...
...
@@ -272,9 +272,21 @@ int main(int Argc, char *Argv[])
i
=
NCONF_load
(
config
,
p
,
&
errline
);
if
(
i
==
0
)
{
NCONF_free
(
config
);
config
=
NULL
;
ERR_clear_error
();
if
(
ERR_GET_REASON
(
ERR_peek_last_error
())
==
CONF_R_NO_SUCH_FILE
)
{
BIO_printf
(
bio_err
,
"WARNING: can't open config file: %s
\n
"
,
p
);
ERR_clear_error
();
NCONF_free
(
config
);
config
=
NULL
;
}
else
{
ERR_print_errors
(
bio_err
);
NCONF_free
(
config
);
exit
(
1
);
}
}
prog
=
prog_init
();
...
...
crypto/engine/eng_cnf.c
浏览文件 @
1a489c9a
...
...
@@ -98,6 +98,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
CONF_VALUE
*
ecmd
;
char
*
ctrlname
,
*
ctrlvalue
;
ENGINE
*
e
=
NULL
;
int
soft
=
0
;
name
=
skip_dot
(
name
);
#ifdef ENGINE_CONF_DEBUG
fprintf
(
stderr
,
"Configuring engine %s
\n
"
,
name
);
...
...
@@ -125,6 +127,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
/* Override engine name to use */
if
(
!
strcmp
(
ctrlname
,
"engine_id"
))
name
=
ctrlvalue
;
else
if
(
!
strcmp
(
ctrlname
,
"soft_load"
))
soft
=
1
;
/* Load a dynamic ENGINE */
else
if
(
!
strcmp
(
ctrlname
,
"dynamic_path"
))
{
...
...
@@ -147,6 +151,11 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
if
(
!
e
)
{
e
=
ENGINE_by_id
(
name
);
if
(
!
e
&&
soft
)
{
ERR_clear_error
();
return
1
;
}
if
(
!
e
)
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录