Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
72b5d03b
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
72b5d03b
编写于
12月 16, 2014
作者:
R
Richard Levitte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clear warnings/errors within CIPHER_DEBUG code sections
Reviewed-by:
N
Tim Hudson
<
tjh@openssl.org
>
上级
a9389163
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
13 deletion
+14
-13
ssl/s3_lib.c
ssl/s3_lib.c
+6
-6
ssl/s3_srvr.c
ssl/s3_srvr.c
+4
-3
ssl/ssl_ciph.c
ssl/ssl_ciph.c
+4
-4
未找到文件。
ssl/s3_lib.c
浏览文件 @
72b5d03b
...
@@ -4457,17 +4457,17 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
...
@@ -4457,17 +4457,17 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
#endif
#endif
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"Server has %d from %p:
\n
"
,
sk_SSL_CIPHER_num
(
srvr
),
(
void
*
)
srvr
);
fprintf
(
stderr
,
"Server has %d from %p:
\n
"
,
sk_SSL_CIPHER_num
(
srvr
),
(
void
*
)
srvr
);
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
srvr
)
;
++
i
)
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
srvr
)
;
++
i
)
{
{
c
=
sk_SSL_CIPHER_value
(
srvr
,
i
);
c
=
sk_SSL_CIPHER_value
(
srvr
,
i
);
printf
(
"%p:%s
\n
"
,(
void
*
)
c
,
c
->
name
);
fprintf
(
stderr
,
"%p:%s
\n
"
,(
void
*
)
c
,
c
->
name
);
}
}
printf
(
"Client sent %d from %p:
\n
"
,
sk_SSL_CIPHER_num
(
clnt
),
(
void
*
)
clnt
);
fprintf
(
stderr
,
"Client sent %d from %p:
\n
"
,
sk_SSL_CIPHER_num
(
clnt
),
(
void
*
)
clnt
);
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
clnt
)
;
++
i
)
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
clnt
)
;
++
i
)
{
{
c
=
sk_SSL_CIPHER_value
(
clnt
,
i
);
c
=
sk_SSL_CIPHER_value
(
clnt
,
i
);
printf
(
"%p:%s
\n
"
,(
void
*
)
c
,
c
->
name
);
fprintf
(
stderr
,
"%p:%s
\n
"
,(
void
*
)
c
,
c
->
name
);
}
}
#endif
#endif
...
@@ -4532,7 +4532,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
...
@@ -4532,7 +4532,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
{
{
ok
=
(
alg_k
&
emask_k
)
&&
(
alg_a
&
emask_a
);
ok
=
(
alg_k
&
emask_k
)
&&
(
alg_a
&
emask_a
);
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)
\n
"
,
ok
,
alg_k
,
alg_a
,
emask_k
,
emask_a
,
fprintf
(
stderr
,
"%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)
\n
"
,
ok
,
alg_k
,
alg_a
,
emask_k
,
emask_a
,
(
void
*
)
c
,
c
->
name
);
(
void
*
)
c
,
c
->
name
);
#endif
#endif
}
}
...
@@ -4540,7 +4540,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
...
@@ -4540,7 +4540,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
{
{
ok
=
(
alg_k
&
mask_k
)
&&
(
alg_a
&
mask_a
);
ok
=
(
alg_k
&
mask_k
)
&&
(
alg_a
&
mask_a
);
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"%d:[%08lX:%08lX:%08lX:%08lX]%p:%s
\n
"
,
ok
,
alg_k
,
alg_a
,
mask_k
,
mask_a
,(
void
*
)
c
,
fprintf
(
stderr
,
"%d:[%08lX:%08lX:%08lX:%08lX]%p:%s
\n
"
,
ok
,
alg_k
,
alg_a
,
mask_k
,
mask_a
,(
void
*
)
c
,
c
->
name
);
c
->
name
);
#endif
#endif
}
}
...
...
ssl/s3_srvr.c
浏览文件 @
72b5d03b
...
@@ -1190,14 +1190,15 @@ int ssl3_get_client_hello(SSL *s)
...
@@ -1190,14 +1190,15 @@ int ssl3_get_client_hello(SSL *s)
id
=
s
->
session
->
cipher
->
id
;
id
=
s
->
session
->
cipher
->
id
;
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"client sent %d ciphers
\n
"
,
sk
_num
(
ciphers
));
fprintf
(
stderr
,
"client sent %d ciphers
\n
"
,
sk_SSL_CIPHER
_num
(
ciphers
));
#endif
#endif
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
ciphers
);
i
++
)
for
(
i
=
0
;
i
<
sk_SSL_CIPHER_num
(
ciphers
);
i
++
)
{
{
c
=
sk_SSL_CIPHER_value
(
ciphers
,
i
);
c
=
sk_SSL_CIPHER_value
(
ciphers
,
i
);
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"client [%2d of %2d]:%s
\n
"
,
fprintf
(
stderr
,
"client [%2d of %2d]:%s
\n
"
,
i
,
sk_num
(
ciphers
),
SSL_CIPHER_get_name
(
c
));
i
,
sk_SSL_CIPHER_num
(
ciphers
),
SSL_CIPHER_get_name
(
c
));
#endif
#endif
if
(
c
->
id
==
id
)
if
(
c
->
id
==
id
)
{
{
...
...
ssl/ssl_ciph.c
浏览文件 @
72b5d03b
...
@@ -954,7 +954,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
...
@@ -954,7 +954,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
int
reverse
=
0
;
int
reverse
=
0
;
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"Applying rule %d with %08lx/%08lx/%08lx/%08lx/%08lx %08lx (%d)
\n
"
,
fprintf
(
stderr
,
"Applying rule %d with %08lx/%08lx/%08lx/%08lx/%08lx %08lx (%d)
\n
"
,
rule
,
alg_mkey
,
alg_auth
,
alg_enc
,
alg_mac
,
alg_ssl
,
algo_strength
,
strength_bits
);
rule
,
alg_mkey
,
alg_auth
,
alg_enc
,
alg_mac
,
alg_ssl
,
algo_strength
,
strength_bits
);
#endif
#endif
...
@@ -1000,7 +1000,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
...
@@ -1000,7 +1000,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
else
else
{
{
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"
\n
Name: %s:
\n
Algo = %08lx/%08lx/%08lx/%08lx/%08lx Algo_strength = %08lx
\n
"
,
cp
->
name
,
cp
->
algorithm_mkey
,
cp
->
algorithm_auth
,
cp
->
algorithm_enc
,
cp
->
algorithm_mac
,
cp
->
algorithm_ssl
,
cp
->
algo_strength
);
fprintf
(
stderr
,
"
\n
Name: %s:
\n
Algo = %08lx/%08lx/%08lx/%08lx/%08lx Algo_strength = %08lx
\n
"
,
cp
->
name
,
cp
->
algorithm_mkey
,
cp
->
algorithm_auth
,
cp
->
algorithm_enc
,
cp
->
algorithm_mac
,
cp
->
algorithm_ssl
,
cp
->
algo_strength
);
#endif
#endif
#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
if
(
cipher_id
&&
cipher_id
!=
cp
->
id
)
if
(
cipher_id
&&
cipher_id
!=
cp
->
id
)
...
@@ -1023,7 +1023,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
...
@@ -1023,7 +1023,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
}
}
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"Action = %d
\n
"
,
rule
);
fprintf
(
stderr
,
"Action = %d
\n
"
,
rule
);
#endif
#endif
/* add the cipher if it has not been added yet. */
/* add the cipher if it has not been added yet. */
...
@@ -1625,7 +1625,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
...
@@ -1625,7 +1625,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
return
NULL
;
return
NULL
;
}
}
#ifdef CIPHER_DEBUG
#ifdef CIPHER_DEBUG
printf
(
"<%s>
\n
"
,
curr
->
cipher
->
name
);
fprintf
(
stderr
,
"<%s>
\n
"
,
curr
->
cipher
->
name
);
#endif
#endif
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录