Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
a5ee80b9
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,发现更多精彩内容 >>
提交
a5ee80b9
编写于
6月 18, 2012
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make it possible to delete all certificates from an SSL structure.
上级
93ab9e42
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
45 addition
and
29 deletion
+45
-29
CHANGES
CHANGES
+5
-0
ssl/ssl.h
ssl/ssl.h
+1
-0
ssl/ssl_cert.c
ssl/ssl_cert.c
+33
-29
ssl/ssl_lib.c
ssl/ssl_lib.c
+5
-0
ssl/ssl_locl.h
ssl/ssl_locl.h
+1
-0
未找到文件。
CHANGES
浏览文件 @
a5ee80b9
...
...
@@ -4,6 +4,11 @@
Changes between 1.0.1 and 1.1.0 [xx XXX xxxx]
*) New function SSL_certs_clear() to delete all references to certificates
from an SSL structure. Before this once a certificate had been added
it couldn't be removed.
[Steve Henson]
*) Initial SSL tracing code. This parses out SSL/TLS records using the
message callback and prints the results. Needs compile time option
"enable-ssl-trace". New options to s_client and s_server to enable
...
...
ssl/ssl.h
浏览文件 @
a5ee80b9
...
...
@@ -1922,6 +1922,7 @@ char *SSL_get_srp_username(SSL *s);
char
*
SSL_get_srp_userinfo
(
SSL
*
s
);
#endif
void
SSL_certs_clear
(
SSL
*
s
);
void
SSL_free
(
SSL
*
ssl
);
int
SSL_accept
(
SSL
*
ssl
);
int
SSL_connect
(
SSL
*
ssl
);
...
...
ssl/ssl_cert.c
浏览文件 @
a5ee80b9
...
...
@@ -379,21 +379,42 @@ err:
EC_KEY_free
(
ret
->
ecdh_tmp
);
#endif
for
(
i
=
0
;
i
<
SSL_PKEY_NUM
;
i
++
)
{
CERT_PKEY
*
rpk
=
ret
->
pkeys
+
i
;
if
(
rpk
->
x509
!=
NULL
)
X509_free
(
rpk
->
x509
);
if
(
rpk
->
privatekey
!=
NULL
)
EVP_PKEY_free
(
rpk
->
privatekey
);
if
(
rpk
->
chain
)
sk_X509_pop_free
(
rpk
->
chain
,
X509_free
);
}
ssl_cert_clear_certs
(
ret
);
return
NULL
;
}
/* Free up and clear all certificates and chains */
void
ssl_cert_clear_certs
(
CERT
*
c
)
{
int
i
;
if
(
c
==
NULL
)
return
;
for
(
i
=
0
;
i
<
SSL_PKEY_NUM
;
i
++
)
{
CERT_PKEY
*
cpk
=
c
->
pkeys
+
i
;
if
(
cpk
->
x509
)
{
X509_free
(
cpk
->
x509
);
cpk
->
x509
=
NULL
;
}
if
(
cpk
->
privatekey
)
{
EVP_PKEY_free
(
cpk
->
privatekey
);
cpk
->
privatekey
=
NULL
;
}
if
(
cpk
->
chain
)
{
sk_X509_pop_free
(
cpk
->
chain
,
X509_free
);
cpk
->
chain
=
NULL
;
}
#ifndef OPENSSL_NO_TLSEXT
if
(
cpk
->
authz
!=
NULL
)
OPENSSL_free
(
cpk
->
authz
);
#endif
}
}
void
ssl_cert_free
(
CERT
*
c
)
{
...
...
@@ -425,24 +446,7 @@ void ssl_cert_free(CERT *c)
if
(
c
->
ecdh_tmp
)
EC_KEY_free
(
c
->
ecdh_tmp
);
#endif
for
(
i
=
0
;
i
<
SSL_PKEY_NUM
;
i
++
)
{
CERT_PKEY
*
cpk
=
c
->
pkeys
+
i
;
if
(
cpk
->
x509
!=
NULL
)
X509_free
(
cpk
->
x509
);
if
(
cpk
->
privatekey
!=
NULL
)
EVP_PKEY_free
(
cpk
->
privatekey
);
if
(
cpk
->
chain
)
sk_X509_pop_free
(
cpk
->
chain
,
X509_free
);
#if 0
if (c->pkeys[i].publickey != NULL)
EVP_PKEY_free(c->pkeys[i].publickey);
#endif
#ifndef OPENSSL_NO_TLSEXT
if
(
c
->
pkeys
[
i
].
authz
!=
NULL
)
OPENSSL_free
(
c
->
pkeys
[
i
].
authz
);
#endif
}
ssl_cert_clear_certs
(
c
);
if
(
c
->
sigalgs
)
OPENSSL_free
(
c
->
sigalgs
);
OPENSSL_free
(
c
);
...
...
ssl/ssl_lib.c
浏览文件 @
a5ee80b9
...
...
@@ -525,6 +525,11 @@ int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm)
return
X509_VERIFY_PARAM_set1
(
ssl
->
param
,
vpm
);
}
void
SSL_certs_clear
(
SSL
*
s
)
{
ssl_cert_clear_certs
(
s
->
cert
);
}
void
SSL_free
(
SSL
*
s
)
{
int
i
;
...
...
ssl/ssl_locl.h
浏览文件 @
a5ee80b9
...
...
@@ -831,6 +831,7 @@ int ssl_clear_bad_session(SSL *s);
CERT
*
ssl_cert_new
(
void
);
CERT
*
ssl_cert_dup
(
CERT
*
cert
);
int
ssl_cert_inst
(
CERT
**
o
);
void
ssl_cert_clear_certs
(
CERT
*
c
);
void
ssl_cert_free
(
CERT
*
c
);
SESS_CERT
*
ssl_sess_cert_new
(
void
);
void
ssl_sess_cert_free
(
SESS_CERT
*
sc
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录