Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2c05c494
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看板
提交
2c05c494
编写于
24年前
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement SSL_OP_TLS_ROLLBACK_BUG for servers.
Call dh_tmp_cb with correct 'is_export' flag. Avoid tabs in CHANGES.
上级
2933ed4d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
15 deletion
+38
-15
CHANGES
CHANGES
+22
-10
ssl/s3_srvr.c
ssl/s3_srvr.c
+16
-5
未找到文件。
CHANGES
浏览文件 @
2c05c494
...
...
@@ -4,6 +4,18 @@
Changes between 0.9.5a and 0.9.6 [xx XXX 2000]
*) Implement SSL_OP_TLS_ROLLBACK_BUG: In ssl3_get_client_key_exchange, if
this option is set, tolerate broken clients that send the negotiated
protocol version number instead of the requested protocol version
number.
[Bodo Moeller]
*) Call dh_tmp_cb (set by ..._TMP_DH_CB) with correct 'is_export' flag;
i.e. non-zero for export ciphersuites, zero otherwise.
Previous versions had this flag inverted, inconsistent with
rsa_tmp_cb (..._TMP_RSA_CB).
[Bodo Moeller; problem reported by Amit Chopra]
*) Add missing DSA library text string. Work around for some IIS
key files with invalid SEQUENCE encoding.
[Steve Henson]
...
...
@@ -19,7 +31,7 @@
[Steve Henson]
*) Eliminate non-ANSI declarations in crypto.h and stack.h.
[Ulf Möller]
[Ulf Möller]
*) Fix for SSL server purpose checking. Server checking was
rejecting certificates which had extended key usage present
...
...
@@ -86,12 +98,12 @@
The new configuration file reading functions are:
NCONF_new, NCONF_free, NCONF_load, NCONF_load_fp, NCONF_load_bio,
NCONF_get_section, NCONF_get_string, NCONF_get_numbre
NCONF_new, NCONF_free, NCONF_load, NCONF_load_fp, NCONF_load_bio,
NCONF_get_section, NCONF_get_string, NCONF_get_numbre
NCONF_default, NCONF_WIN32
NCONF_default, NCONF_WIN32
NCONF_dump_fp, NCONF_dump_bio
NCONF_dump_fp, NCONF_dump_bio
NCONF_default and NCONF_WIN32 are method (or "class") choosers,
NCONF_new creates a new CONF object. This works in the same way
...
...
@@ -757,11 +769,11 @@
With these changes, a new set of functions and macros have appeared:
CRYPTO_set_mem_debug_functions()
[F]
CRYPTO_get_mem_debug_functions()
[F]
CRYPTO_dbg_set_options()
[F]
CRYPTO_dbg_get_options()
[F]
CRYPTO_malloc_debug_init()
[M]
CRYPTO_set_mem_debug_functions()
[F]
CRYPTO_get_mem_debug_functions()
[F]
CRYPTO_dbg_set_options()
[F]
CRYPTO_dbg_get_options()
[F]
CRYPTO_malloc_debug_init()
[M]
The memory debug functions are NULL by default, unless the library
is compiled with CRYPTO_MDEBUG or friends is defined. If someone
...
...
This diff is collapsed.
Click to expand it.
ssl/s3_srvr.c
浏览文件 @
2c05c494
...
...
@@ -982,7 +982,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
dhp
=
cert
->
dh_tmp
;
if
((
dhp
==
NULL
)
&&
(
s
->
cert
->
dh_tmp_cb
!=
NULL
))
dhp
=
s
->
cert
->
dh_tmp_cb
(
s
,
!
SSL_C_IS_EXPORT
(
s
->
s3
->
tmp
.
new_cipher
),
SSL_C_IS_EXPORT
(
s
->
s3
->
tmp
.
new_cipher
),
SSL_C_EXPORT_PKEYLENGTH
(
s
->
s3
->
tmp
.
new_cipher
));
if
(
dhp
==
NULL
)
{
...
...
@@ -1326,11 +1326,22 @@ static int ssl3_get_client_key_exchange(SSL *s)
goto
f_err
;
}
if
(
(
p
[
0
]
!=
(
s
->
client_version
>>
8
))
||
(
p
[
1
]
!=
(
s
->
client_version
&
0xff
)))
if
(
!
((
p
[
0
]
==
(
s
->
client_version
>>
8
))
&&
(
p
[
1
]
==
(
s
->
client_version
&
0xff
)
)))
{
al
=
SSL_AD_DECODE_ERROR
;
SSLerr
(
SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE
,
SSL_R_BAD_PROTOCOL_VERSION_NUMBER
);
goto
f_err
;
/* The premaster secret must contain the same version number as the
* ClientHello to detect version rollback attacks (strangely, the
* protocol does not offer such protection for DH ciphersuites).
* However, buggy clients exist that send the negotiated protocol
* version instead if the servers does not support the requested
* protocol version.
* If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */
if
(
!
((
s
->
options
&
SSL_OP_TLS_ROLLBACK_BUG
)
&&
(
p
[
0
]
==
(
s
->
version
>>
8
))
&&
(
p
[
1
]
==
(
s
->
version
&
0xff
))))
{
al
=
SSL_AD_DECODE_ERROR
;
SSLerr
(
SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE
,
SSL_R_BAD_PROTOCOL_VERSION_NUMBER
);
goto
f_err
;
}
}
s
->
session
->
master_key_length
=
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部