Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
0946a198
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
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,发现更多精彩内容 >>
提交
0946a198
编写于
7月 25, 2016
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use X509_LOOKUP_TYPE for lookup type consistently.
Reviewed-by:
N
Rich Salz
<
rsalz@openssl.org
>
上级
4c4a2f67
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
34 deletion
+41
-34
crypto/x509/by_dir.c
crypto/x509/by_dir.c
+2
-2
crypto/x509/x509_lcl.h
crypto/x509/x509_lcl.h
+8
-7
crypto/x509/x509_lu.c
crypto/x509/x509_lu.c
+15
-12
include/openssl/x509_vfy.h
include/openssl/x509_vfy.h
+16
-13
未找到文件。
crypto/x509/by_dir.c
浏览文件 @
0946a198
...
...
@@ -48,8 +48,8 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
static
int
new_dir
(
X509_LOOKUP
*
lu
);
static
void
free_dir
(
X509_LOOKUP
*
lu
);
static
int
add_cert_dir
(
BY_DIR
*
ctx
,
const
char
*
dir
,
int
type
);
static
int
get_cert_by_subject
(
X509_LOOKUP
*
xl
,
int
type
,
X509_NAME
*
nam
e
,
X509_OBJECT
*
ret
);
static
int
get_cert_by_subject
(
X509_LOOKUP
*
xl
,
X509_LOOKUP_TYPE
typ
e
,
X509_
NAME
*
name
,
X509_
OBJECT
*
ret
);
static
X509_LOOKUP_METHOD
x509_dir_lookup
=
{
"Load certs from files in a directory"
,
new_dir
,
/* new */
...
...
crypto/x509/x509_lcl.h
浏览文件 @
0946a198
...
...
@@ -74,15 +74,16 @@ struct x509_lookup_method_st {
int
(
*
shutdown
)
(
X509_LOOKUP
*
ctx
);
int
(
*
ctrl
)
(
X509_LOOKUP
*
ctx
,
int
cmd
,
const
char
*
argc
,
long
argl
,
char
**
ret
);
int
(
*
get_by_subject
)
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
int
(
*
get_by_issuer_serial
)
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
);
int
(
*
get_by_fingerprint
)
(
X509_LOOKUP
*
ctx
,
int
type
,
int
(
*
get_by_subject
)
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
int
(
*
get_by_issuer_serial
)
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
);
int
(
*
get_by_fingerprint
)
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
unsigned
char
*
bytes
,
int
len
,
X509_OBJECT
*
ret
);
int
(
*
get_by_alias
)
(
X509_LOOKUP
*
ctx
,
int
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
);
int
(
*
get_by_alias
)
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
);
};
/* This is the functions plus an instance of the local variables. */
...
...
crypto/x509/x509_lu.c
浏览文件 @
0946a198
...
...
@@ -81,8 +81,8 @@ int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
return
1
;
}
int
X509_LOOKUP_by_subject
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
nam
e
,
X509_OBJECT
*
ret
)
int
X509_LOOKUP_by_subject
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
typ
e
,
X509_
NAME
*
name
,
X509_
OBJECT
*
ret
)
{
if
((
ctx
->
method
==
NULL
)
||
(
ctx
->
method
->
get_by_subject
==
NULL
))
return
X509_LU_FAIL
;
...
...
@@ -91,15 +91,16 @@ int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
return
ctx
->
method
->
get_by_subject
(
ctx
,
type
,
name
,
ret
);
}
int
X509_LOOKUP_by_issuer_serial
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
)
int
X509_LOOKUP_by_issuer_serial
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
)
{
if
((
ctx
->
method
==
NULL
)
||
(
ctx
->
method
->
get_by_issuer_serial
==
NULL
))
return
X509_LU_FAIL
;
return
ctx
->
method
->
get_by_issuer_serial
(
ctx
,
type
,
name
,
serial
,
ret
);
}
int
X509_LOOKUP_by_fingerprint
(
X509_LOOKUP
*
ctx
,
int
type
,
int
X509_LOOKUP_by_fingerprint
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
unsigned
char
*
bytes
,
int
len
,
X509_OBJECT
*
ret
)
{
...
...
@@ -108,8 +109,8 @@ int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
return
ctx
->
method
->
get_by_fingerprint
(
ctx
,
type
,
bytes
,
len
,
ret
);
}
int
X509_LOOKUP_by_alias
(
X509_LOOKUP
*
ctx
,
int
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
)
int
X509_LOOKUP_by_alias
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
)
{
if
((
ctx
->
method
==
NULL
)
||
(
ctx
->
method
->
get_by_alias
==
NULL
))
return
X509_LU_FAIL
;
...
...
@@ -256,7 +257,8 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m)
}
}
X509_OBJECT
*
X509_STORE_CTX_get_obj_by_subject
(
X509_STORE_CTX
*
vs
,
int
type
,
X509_OBJECT
*
X509_STORE_CTX_get_obj_by_subject
(
X509_STORE_CTX
*
vs
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
)
{
X509_OBJECT
*
ret
=
X509_OBJECT_new
();
...
...
@@ -399,7 +401,7 @@ X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *a)
return
a
->
data
.
crl
;
}
int
X509_OBJECT_get_type
(
const
X509_OBJECT
*
a
)
X509_LOOKUP_TYPE
X509_OBJECT_get_type
(
const
X509_OBJECT
*
a
)
{
return
a
->
type
;
}
...
...
@@ -434,7 +436,7 @@ void X509_OBJECT_free(X509_OBJECT *a)
OPENSSL_free
(
a
);
}
static
int
x509_object_idx_cnt
(
STACK_OF
(
X509_OBJECT
)
*
h
,
int
type
,
static
int
x509_object_idx_cnt
(
STACK_OF
(
X509_OBJECT
)
*
h
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
int
*
pnmatch
)
{
X509_OBJECT
stmp
;
...
...
@@ -473,14 +475,15 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, int type,
return
idx
;
}
int
X509_OBJECT_idx_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
int
type
,
int
X509_OBJECT_idx_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
)
{
return
x509_object_idx_cnt
(
h
,
type
,
name
,
NULL
);
}
X509_OBJECT
*
X509_OBJECT_retrieve_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
int
type
,
X509_NAME
*
name
)
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
)
{
int
idx
;
idx
=
X509_OBJECT_idx_by_subject
(
h
,
type
,
name
);
...
...
include/openssl/x509_vfy.h
浏览文件 @
0946a198
...
...
@@ -243,16 +243,17 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
| X509_V_FLAG_INHIBIT_ANY \
| X509_V_FLAG_INHIBIT_MAP)
int
X509_OBJECT_idx_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
int
type
,
int
X509_OBJECT_idx_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
);
X509_OBJECT
*
X509_OBJECT_retrieve_by_subject
(
STACK_OF
(
X509_OBJECT
)
*
h
,
int
type
,
X509_NAME
*
name
);
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
);
X509_OBJECT
*
X509_OBJECT_retrieve_match
(
STACK_OF
(
X509_OBJECT
)
*
h
,
X509_OBJECT
*
x
);
int
X509_OBJECT_up_ref_count
(
X509_OBJECT
*
a
);
X509_OBJECT
*
X509_OBJECT_new
(
void
);
void
X509_OBJECT_free
(
X509_OBJECT
*
a
);
int
X509_OBJECT_get_type
(
const
X509_OBJECT
*
a
);
X509_LOOKUP_TYPE
X509_OBJECT_get_type
(
const
X509_OBJECT
*
a
);
X509
*
X509_OBJECT_get0_X509
(
const
X509_OBJECT
*
a
);
X509_CRL
*
X509_OBJECT_get0_X509_CRL
(
X509_OBJECT
*
a
);
X509_STORE
*
X509_STORE_new
(
void
);
...
...
@@ -362,9 +363,10 @@ X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
int
X509_STORE_add_cert
(
X509_STORE
*
ctx
,
X509
*
x
);
int
X509_STORE_add_crl
(
X509_STORE
*
ctx
,
X509_CRL
*
x
);
int
X509_STORE_CTX_get_by_subject
(
X509_STORE_CTX
*
vs
,
int
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
X509_OBJECT
*
X509_STORE_CTX_get_obj_by_subject
(
X509_STORE_CTX
*
vs
,
int
type
,
int
X509_STORE_CTX_get_by_subject
(
X509_STORE_CTX
*
vs
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
X509_OBJECT
*
X509_STORE_CTX_get_obj_by_subject
(
X509_STORE_CTX
*
vs
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
);
int
X509_LOOKUP_ctrl
(
X509_LOOKUP
*
ctx
,
int
cmd
,
const
char
*
argc
,
...
...
@@ -377,15 +379,16 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
X509_LOOKUP
*
X509_LOOKUP_new
(
X509_LOOKUP_METHOD
*
method
);
void
X509_LOOKUP_free
(
X509_LOOKUP
*
ctx
);
int
X509_LOOKUP_init
(
X509_LOOKUP
*
ctx
);
int
X509_LOOKUP_by_subject
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_issuer_serial
(
X509_LOOKUP
*
ctx
,
int
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_fingerprint
(
X509_LOOKUP
*
ctx
,
int
type
,
int
X509_LOOKUP_by_subject
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_issuer_serial
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
X509_NAME
*
name
,
ASN1_INTEGER
*
serial
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_fingerprint
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
unsigned
char
*
bytes
,
int
len
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_alias
(
X509_LOOKUP
*
ctx
,
int
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_by_alias
(
X509_LOOKUP
*
ctx
,
X509_LOOKUP_TYPE
type
,
char
*
str
,
int
len
,
X509_OBJECT
*
ret
);
int
X509_LOOKUP_shutdown
(
X509_LOOKUP
*
ctx
);
int
X509_STORE_load_locations
(
X509_STORE
*
ctx
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录