Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
fabce041
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看板
提交
fabce041
编写于
25年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make s_server, s_client check cipher list return codes.
Update docs.
上级
64287002
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
16 deletion
+41
-16
CHANGES
CHANGES
+21
-9
apps/s_client.c
apps/s_client.c
+6
-2
apps/s_server.c
apps/s_server.c
+5
-1
doc/apps/s_client.pod
doc/apps/s_client.pod
+4
-2
doc/apps/s_server.pod
doc/apps/s_server.pod
+5
-2
未找到文件。
CHANGES
浏览文件 @
fabce041
...
...
@@ -20,15 +20,27 @@
(instead of parameters) in future.
[Steve Henson]
*) Apply Lutz Jaenicke's 56bit cipher patch. This should fix the problems
with cipher ordering and the new EXPORT1024 ciphers. Only two minor
changes have been made, the error reason codes have been altered and the
@STRENGTH sorting behaviour changed so eNULL ciphers are also sorted
(if present).
One other addition: the "ciphers" program didn't check the return code
of SSL_CTX_set_cipher_list().
[Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> modified by Steve Henson]
*) Make the ciphers, s_server and s_client programs check the return values
when a new cipher list is set.
[Steve Henson]
*) Enhance the SSL/TLS cipher mechanism to correctly handle the TLS 56bit
ciphers. Before when the 56bit ciphers were enabled the sorting was
wrong.
The syntax for the cipher sorting has been extended to support sorting by
cipher-strength (using the strength_bits hard coded in the tables).
The new command is "@STRENGTH" (see also doc/apps/ciphers.pod).
Fix a bug in the cipher-command parser: when supplying a cipher command
string with an "undefined" symbol (neither command nor alphanumeric
[A-Za-z0-9], ssl_set_cipher_list used to hang in an endless loop. Now
an error is flagged.
Due to the strength-sorting extension, the code of the
ssl_create_cipher_list() function was completely rearranged. I hope that
the readability was also increased :-)
[Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>]
*) Minor change to 'x509' utility. The -CAcreateserial option now uses 1
for the first serial number and places 2 in the serial number file. This
...
...
This diff is collapsed.
Click to expand it.
apps/s_client.c
浏览文件 @
fabce041
...
...
@@ -338,6 +338,7 @@ bad:
}
SSLeay_add_ssl_algorithms
();
SSL_load_error_strings
();
ctx
=
SSL_CTX_new
(
meth
);
if
(
ctx
==
NULL
)
{
...
...
@@ -352,7 +353,11 @@ bad:
if
(
state
)
SSL_CTX_set_info_callback
(
ctx
,
apps_ssl_info_callback
);
if
(
cipher
!=
NULL
)
SSL_CTX_set_cipher_list
(
ctx
,
cipher
);
if
(
!
SSL_CTX_set_cipher_list
(
ctx
,
cipher
))
{
BIO_printf
(
bio_err
,
"error seting cipher list
\n
"
);
ERR_print_errors
(
bio_err
);
goto
end
;
}
#if 0
else
SSL_CTX_set_cipher_list(ctx,getenv("SSL_CIPHER"));
...
...
@@ -370,7 +375,6 @@ bad:
/* goto end; */
}
SSL_load_error_strings
();
con
=
(
SSL
*
)
SSL_new
(
ctx
);
/* SSL_set_cipher_list(con,"RC4-MD5"); */
...
...
This diff is collapsed.
Click to expand it.
apps/s_server.c
浏览文件 @
fabce041
...
...
@@ -697,7 +697,11 @@ bad:
#endif
if
(
cipher
!=
NULL
)
SSL_CTX_set_cipher_list
(
ctx
,
cipher
);
if
(
!
SSL_CTX_set_cipher_list
(
ctx
,
cipher
))
{
BIO_printf
(
bio_err
,
"error seting cipher list
\n
"
);
ERR_print_errors
(
bio_err
);
goto
end
;
}
SSL_CTX_set_verify
(
ctx
,
s_server_verify
,
verify_callback
);
SSL_CTX_set_session_id_context
(
ctx
,(
void
*
)
&
s_server_session_id_context
,
sizeof
s_server_session_id_context
);
...
...
This diff is collapsed.
Click to expand it.
doc/apps/s_client.pod
浏览文件 @
fabce041
...
...
@@ -144,8 +144,10 @@ option enables various workarounds.
=item B<-cipher cipherlist>
this allows the cipher list sent by the client to be modified. See the
B<ciphers> command for more information.
this allows the cipher list sent by the client to be modified. Although
the server determines which cipher suite is used it should take the first
supported cipher in the list sent by the client. See the B<ciphers>
command for more information.
=back
...
...
This diff is collapsed.
Click to expand it.
doc/apps/s_server.pod
浏览文件 @
fabce041
...
...
@@ -167,8 +167,11 @@ SSL code (?).
=item B<-cipher cipherlist>
this allows the cipher list sent by the client to be modified. See the
B<ciphers> command for more information.
this allows the cipher list used by the server to be modified. When
the client sends a list of supported ciphers the first client cipher
also included in the server list is used. Because the client specifies
the preference order, the order of the server cipherlist irrelevant. See
the B<ciphers> command for more information.
=item B<-www>
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部