Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
e4646a89
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,发现更多精彩内容 >>
提交
e4646a89
编写于
2月 07, 2016
作者:
K
Kurt Roeckx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Constify security callbacks
Reviewed-by:
N
Viktor Dukhovni
<
viktor@openssl.org
>
MR: #1595
上级
ca74c38d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
19 deletion
+19
-19
apps/s_cb.c
apps/s_cb.c
+2
-2
include/openssl/ssl.h
include/openssl/ssl.h
+5
-5
ssl/ssl_cert.c
ssl/ssl_cert.c
+4
-4
ssl/ssl_lib.c
ssl/ssl_lib.c
+5
-5
ssl/ssl_locl.h
ssl/ssl_locl.h
+3
-3
未找到文件。
apps/s_cb.c
浏览文件 @
e4646a89
...
...
@@ -1285,7 +1285,7 @@ int ssl_load_stores(SSL_CTX *ctx,
typedef
struct
{
BIO
*
out
;
int
verbose
;
int
(
*
old_cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
int
(
*
old_cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
);
}
security_debug_ex
;
...
...
@@ -1314,7 +1314,7 @@ static STRINT_PAIR callback_types[] = {
{
NULL
}
};
static
int
security_callback_debug
(
SSL
*
s
,
SSL_CTX
*
ctx
,
static
int
security_callback_debug
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
)
{
...
...
include/openssl/ssl.h
浏览文件 @
e4646a89
...
...
@@ -1990,10 +1990,10 @@ int SSL_CTX_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
void
SSL_set_security_level
(
SSL
*
s
,
int
level
);
__owur
int
SSL_get_security_level
(
const
SSL
*
s
);
void
SSL_set_security_callback
(
SSL
*
s
,
int
(
*
cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
));
int
(
*
SSL_get_security_callback
(
const
SSL
*
s
))
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
SSL_get_security_callback
(
const
SSL
*
s
))
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
);
void
SSL_set0_security_ex_data
(
SSL
*
s
,
void
*
ex
);
...
...
@@ -2002,11 +2002,11 @@ __owur void *SSL_get0_security_ex_data(const SSL *s);
void
SSL_CTX_set_security_level
(
SSL_CTX
*
ctx
,
int
level
);
__owur
int
SSL_CTX_get_security_level
(
const
SSL_CTX
*
ctx
);
void
SSL_CTX_set_security_callback
(
SSL_CTX
*
ctx
,
int
(
*
cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
));
int
(
*
SSL_CTX_get_security_callback
(
const
SSL_CTX
*
ctx
))
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
(
*
SSL_CTX_get_security_callback
(
const
SSL_CTX
*
ctx
))
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
...
...
ssl/ssl_cert.c
浏览文件 @
e4646a89
...
...
@@ -132,7 +132,7 @@
#include "internal/threads.h"
#include "ssl_locl.h"
static
int
ssl_security_default_callback
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
static
int
ssl_security_default_callback
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
);
...
...
@@ -1062,7 +1062,7 @@ int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain, int ref)
return
1
;
}
static
int
ssl_security_default_callback
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
static
int
ssl_security_default_callback
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
)
{
...
...
@@ -1144,12 +1144,12 @@ static int ssl_security_default_callback(SSL *s, SSL_CTX *ctx, int op,
return
1
;
}
int
ssl_security
(
SSL
*
s
,
int
op
,
int
bits
,
int
nid
,
void
*
other
)
int
ssl_security
(
const
SSL
*
s
,
int
op
,
int
bits
,
int
nid
,
void
*
other
)
{
return
s
->
cert
->
sec_cb
(
s
,
NULL
,
op
,
bits
,
nid
,
other
,
s
->
cert
->
sec_ex
);
}
int
ssl_ctx_security
(
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
)
int
ssl_ctx_security
(
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
)
{
return
ctx
->
cert
->
sec_cb
(
NULL
,
ctx
,
op
,
bits
,
nid
,
other
,
ctx
->
cert
->
sec_ex
);
...
...
ssl/ssl_lib.c
浏览文件 @
e4646a89
...
...
@@ -3786,14 +3786,14 @@ int SSL_get_security_level(const SSL *s)
}
void
SSL_set_security_callback
(
SSL
*
s
,
int
(
*
cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
))
{
s
->
cert
->
sec_cb
=
cb
;
}
int
(
*
SSL_get_security_callback
(
const
SSL
*
s
))
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
SSL_get_security_callback
(
const
SSL
*
s
))
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
)
{
return
s
->
cert
->
sec_cb
;
...
...
@@ -3820,15 +3820,15 @@ int SSL_CTX_get_security_level(const SSL_CTX *ctx)
}
void
SSL_CTX_set_security_callback
(
SSL_CTX
*
ctx
,
int
(
*
cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
(
*
cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
))
{
ctx
->
cert
->
sec_cb
=
cb
;
}
int
(
*
SSL_CTX_get_security_callback
(
const
SSL_CTX
*
ctx
))
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
(
*
SSL_CTX_get_security_callback
(
const
SSL_CTX
*
ctx
))
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
...
...
ssl/ssl_locl.h
浏览文件 @
e4646a89
...
...
@@ -1636,7 +1636,7 @@ typedef struct cert_st {
custom_ext_methods
cli_ext
;
custom_ext_methods
srv_ext
;
/* Security callback */
int
(
*
sec_cb
)
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
int
(
*
sec_cb
)
(
const
SSL
*
s
,
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
,
void
*
ex
);
/* Security level */
int
sec_level
;
...
...
@@ -1912,8 +1912,8 @@ __owur int ssl_add_cert_chain(SSL *s, CERT_PKEY *cpk, unsigned long *l);
__owur
int
ssl_build_cert_chain
(
SSL
*
s
,
SSL_CTX
*
ctx
,
int
flags
);
__owur
int
ssl_cert_set_cert_store
(
CERT
*
c
,
X509_STORE
*
store
,
int
chain
,
int
ref
);
__owur
int
ssl_security
(
SSL
*
s
,
int
op
,
int
bits
,
int
nid
,
void
*
other
);
__owur
int
ssl_ctx_security
(
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
);
__owur
int
ssl_security
(
const
SSL
*
s
,
int
op
,
int
bits
,
int
nid
,
void
*
other
);
__owur
int
ssl_ctx_security
(
const
SSL_CTX
*
ctx
,
int
op
,
int
bits
,
int
nid
,
void
*
other
);
int
ssl_undefined_function
(
SSL
*
s
);
__owur
int
ssl_undefined_void_function
(
void
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录