Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
韩旭在努力
arduino-esp32
提交
f29f4485
A
arduino-esp32
项目概览
韩旭在努力
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f29f4485
编写于
12月 14, 2021
作者:
P
Paolo Messina
提交者:
GitHub
12月 14, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix memory leaks when SSL/TLS connection fails (#5945)
上级
8a8f87d3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
4 deletion
+16
-4
libraries/WiFiClientSecure/src/ssl_client.cpp
libraries/WiFiClientSecure/src/ssl_client.cpp
+16
-4
未找到文件。
libraries/WiFiClientSecure/src/ssl_client.cpp
浏览文件 @
f29f4485
...
...
@@ -45,6 +45,8 @@ static int _handle_error(int err, const char * function, int line)
void
ssl_init
(
sslclient_context
*
ssl_client
)
{
// reset embedded pointers to zero
memset
(
ssl_client
,
0
,
sizeof
(
sslclient_context
));
mbedtls_ssl_init
(
&
ssl_client
->
ssl_ctx
);
mbedtls_ssl_config_init
(
&
ssl_client
->
ssl_conf
);
mbedtls_ctr_drbg_init
(
&
ssl_client
->
drbg_ctx
);
...
...
@@ -232,6 +234,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
ret
=
mbedtls_pk_parse_key
(
&
ssl_client
->
client_key
,
(
const
unsigned
char
*
)
cli_key
,
strlen
(
cli_key
)
+
1
,
NULL
,
0
);
if
(
ret
!=
0
)
{
mbedtls_x509_crt_free
(
&
ssl_client
->
client_cert
);
// cert+key are free'd in pair
return
handle_error
(
ret
);
}
...
...
@@ -243,7 +246,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
// Hostname set here should match CN in server certificate
if
((
ret
=
mbedtls_ssl_set_hostname
(
&
ssl_client
->
ssl_ctx
,
host
))
!=
0
){
return
handle_error
(
ret
);
}
}
mbedtls_ssl_conf_rng
(
&
ssl_client
->
ssl_conf
,
mbedtls_ctr_drbg_random
,
&
ssl_client
->
drbg_ctx
);
...
...
@@ -260,8 +263,8 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
return
handle_error
(
ret
);
}
if
((
millis
()
-
handshake_start_time
)
>
ssl_client
->
handshake_timeout
)
return
-
1
;
vTaskDelay
(
2
);
//2 ticks
return
-
1
;
vTaskDelay
(
2
);
//2 ticks
}
...
...
@@ -280,7 +283,6 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
memset
(
buf
,
0
,
sizeof
(
buf
));
mbedtls_x509_crt_verify_info
(
buf
,
sizeof
(
buf
),
" ! "
,
flags
);
log_e
(
"Failed to verify peer certificate! verification info: %s"
,
buf
);
stop_ssl_socket
(
ssl_client
,
rootCABuff
,
cli_cert
,
cli_key
);
//It's not safe continue.
return
handle_error
(
ret
);
}
else
{
log_v
(
"Certificate verified."
);
...
...
@@ -313,10 +315,20 @@ void stop_ssl_socket(sslclient_context *ssl_client, const char *rootCABuff, cons
ssl_client
->
socket
=
-
1
;
}
// avoid memory leak if ssl connection attempt failed
if
(
ssl_client
->
ssl_conf
.
ca_chain
!=
NULL
)
{
mbedtls_x509_crt_free
(
&
ssl_client
->
ca_cert
);
}
if
(
ssl_client
->
ssl_conf
.
key_cert
!=
NULL
)
{
mbedtls_x509_crt_free
(
&
ssl_client
->
client_cert
);
mbedtls_pk_free
(
&
ssl_client
->
client_key
);
}
mbedtls_ssl_free
(
&
ssl_client
->
ssl_ctx
);
mbedtls_ssl_config_free
(
&
ssl_client
->
ssl_conf
);
mbedtls_ctr_drbg_free
(
&
ssl_client
->
drbg_ctx
);
mbedtls_entropy_free
(
&
ssl_client
->
entropy_ctx
);
// reset embedded pointers to zero
memset
(
ssl_client
,
0
,
sizeof
(
sslclient_context
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录