Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
29e722f0
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看板
提交
29e722f0
编写于
2月 09, 2010
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix memory leak in ENGINE autoconfig code. Improve error logging.
上级
05566760
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
17 addition
and
4 deletion
+17
-4
crypto/engine/eng_cnf.c
crypto/engine/eng_cnf.c
+14
-3
crypto/engine/eng_err.c
crypto/engine/eng_err.c
+2
-1
crypto/engine/engine.h
crypto/engine/engine.h
+1
-0
未找到文件。
crypto/engine/eng_cnf.c
浏览文件 @
29e722f0
...
@@ -95,7 +95,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
...
@@ -95,7 +95,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
int
ret
=
0
;
int
ret
=
0
;
long
do_init
=
-
1
;
long
do_init
=
-
1
;
STACK_OF
(
CONF_VALUE
)
*
ecmds
;
STACK_OF
(
CONF_VALUE
)
*
ecmds
;
CONF_VALUE
*
ecmd
;
CONF_VALUE
*
ecmd
=
NULL
;
char
*
ctrlname
,
*
ctrlvalue
;
char
*
ctrlname
,
*
ctrlvalue
;
ENGINE
*
e
=
NULL
;
ENGINE
*
e
=
NULL
;
int
soft
=
0
;
int
soft
=
0
;
...
@@ -157,7 +157,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
...
@@ -157,7 +157,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
return
1
;
return
1
;
}
}
if
(
!
e
)
if
(
!
e
)
return
0
;
goto
err
;
}
}
/* Allow "EMPTY" to mean no value: this allows a valid
/* Allow "EMPTY" to mean no value: this allows a valid
* "value" to be passed to ctrls of type NO_INPUT
* "value" to be passed to ctrls of type NO_INPUT
...
@@ -186,16 +186,27 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
...
@@ -186,16 +186,27 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
}
}
else
if
(
!
ENGINE_ctrl_cmd_string
(
e
,
else
if
(
!
ENGINE_ctrl_cmd_string
(
e
,
ctrlname
,
ctrlvalue
,
0
))
ctrlname
,
ctrlvalue
,
0
))
return
0
;
goto
err
;
}
}
}
}
if
(
e
&&
(
do_init
==
-
1
)
&&
!
int_engine_init
(
e
))
if
(
e
&&
(
do_init
==
-
1
)
&&
!
int_engine_init
(
e
))
{
ecmd
=
NULL
;
goto
err
;
goto
err
;
}
ret
=
1
;
ret
=
1
;
err:
err:
if
(
ret
!=
1
)
{
ENGINEerr
(
ENGINE_F_INT_ENGINE_CONFIGURE
,
ENGINE_R_ENGINE_CONFIGURATION_ERROR
);
if
(
ecmd
)
ERR_add_error_data
(
6
,
"section="
,
ecmd
->
section
,
", name="
,
ecmd
->
name
,
", value="
,
ecmd
->
value
);
}
if
(
e
)
if
(
e
)
ENGINE_free
(
e
);
ENGINE_free
(
e
);
return
ret
;
return
ret
;
...
...
crypto/engine/eng_err.c
浏览文件 @
29e722f0
/* crypto/engine/eng_err.c */
/* crypto/engine/eng_err.c */
/* ====================================================================
/* ====================================================================
* Copyright (c) 1999-20
07
The OpenSSL Project. All rights reserved.
* Copyright (c) 1999-20
10
The OpenSSL Project. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* modification, are permitted provided that the following conditions
...
@@ -126,6 +126,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]=
...
@@ -126,6 +126,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]=
{
ERR_REASON
(
ENGINE_R_DSO_FAILURE
)
,
"DSO failure"
},
{
ERR_REASON
(
ENGINE_R_DSO_FAILURE
)
,
"DSO failure"
},
{
ERR_REASON
(
ENGINE_R_DSO_NOT_FOUND
)
,
"dso not found"
},
{
ERR_REASON
(
ENGINE_R_DSO_NOT_FOUND
)
,
"dso not found"
},
{
ERR_REASON
(
ENGINE_R_ENGINES_SECTION_ERROR
),
"engines section error"
},
{
ERR_REASON
(
ENGINE_R_ENGINES_SECTION_ERROR
),
"engines section error"
},
{
ERR_REASON
(
ENGINE_R_ENGINE_CONFIGURATION_ERROR
),
"engine configuration error"
},
{
ERR_REASON
(
ENGINE_R_ENGINE_IS_NOT_IN_LIST
),
"engine is not in the list"
},
{
ERR_REASON
(
ENGINE_R_ENGINE_IS_NOT_IN_LIST
),
"engine is not in the list"
},
{
ERR_REASON
(
ENGINE_R_ENGINE_SECTION_ERROR
),
"engine section error"
},
{
ERR_REASON
(
ENGINE_R_ENGINE_SECTION_ERROR
),
"engine section error"
},
{
ERR_REASON
(
ENGINE_R_FAILED_LOADING_PRIVATE_KEY
),
"failed loading private key"
},
{
ERR_REASON
(
ENGINE_R_FAILED_LOADING_PRIVATE_KEY
),
"failed loading private key"
},
...
...
crypto/engine/engine.h
浏览文件 @
29e722f0
...
@@ -795,6 +795,7 @@ void ERR_load_ENGINE_strings(void);
...
@@ -795,6 +795,7 @@ void ERR_load_ENGINE_strings(void);
#define ENGINE_R_DSO_FAILURE 104
#define ENGINE_R_DSO_FAILURE 104
#define ENGINE_R_DSO_NOT_FOUND 132
#define ENGINE_R_DSO_NOT_FOUND 132
#define ENGINE_R_ENGINES_SECTION_ERROR 148
#define ENGINE_R_ENGINES_SECTION_ERROR 148
#define ENGINE_R_ENGINE_CONFIGURATION_ERROR 102
#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105
#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105
#define ENGINE_R_ENGINE_SECTION_ERROR 149
#define ENGINE_R_ENGINE_SECTION_ERROR 149
#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128
#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录