Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
0858b71b
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看板
提交
0858b71b
编写于
19年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make kerberos ciphersuite code work with newer header files
上级
d9bfe4f9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
8 deletion
+28
-8
CHANGES
CHANGES
+8
-0
ssl/kssl.c
ssl/kssl.c
+12
-6
ssl/kssl.h
ssl/kssl.h
+6
-0
ssl/s3_srvr.c
ssl/s3_srvr.c
+2
-2
未找到文件。
CHANGES
浏览文件 @
0858b71b
...
...
@@ -780,6 +780,14 @@
Changes between 0.9.7f and 0.9.7g [XX xxx xxxx]
*) Fixes for newer kerberos headers. NB: the casts are needed because
the 'length' field is signed on one version and unsigned on another
with no (?) obvious way to tell the difference, without these VC++
complains. Also the "definition" of FAR (blank) is no longer included
nor is the error ENOMEM. KRB5_PRIVATE has to be set to 1 to pick up
some needed definitions.
[Steve Henson]
*) Undo Cygwin change.
[Ulf Möller]
...
...
This diff is collapsed.
Click to expand it.
ssl/kssl.c
浏览文件 @
0858b71b
...
...
@@ -73,6 +73,8 @@
#undef _XOPEN_SOURCE
/* To avoid clashes with anything else... */
#include <string.h>
#define KRB5_PRIVATE 1
#include <openssl/ssl.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
...
...
@@ -80,6 +82,10 @@
#ifndef OPENSSL_NO_KRB5
#ifndef ENOMEM
#define ENOMEM KRB5KRB_ERR_GENERIC
#endif
/*
* When OpenSSL is built on Windows, we do not want to require that
* the Kerberos DLLs be available in order for the OpenSSL DLLs to
...
...
@@ -932,7 +938,7 @@ print_krb5_data(char *label, krb5_data *kdata)
int
i
;
printf
(
"%s[%d] "
,
label
,
kdata
->
length
);
for
(
i
=
0
;
i
<
kdata
->
length
;
i
++
)
for
(
i
=
0
;
i
<
(
int
)
kdata
->
length
;
i
++
)
{
if
(
0
&&
isprint
((
int
)
kdata
->
data
[
i
]))
printf
(
"%c "
,
kdata
->
data
[
i
]);
...
...
@@ -984,14 +990,14 @@ print_krb5_keyblock(char *label, krb5_keyblock *keyblk)
#ifdef KRB5_HEIMDAL
printf
(
"%s
\n\t
[et%d:%d]: "
,
label
,
keyblk
->
keytype
,
keyblk
->
keyvalue
->
length
);
for
(
i
=
0
;
i
<
keyblk
->
keyvalue
->
length
;
i
++
)
for
(
i
=
0
;
i
<
(
int
)
keyblk
->
keyvalue
->
length
;
i
++
)
{
printf
(
"%02x"
,(
unsigned
char
*
)(
keyblk
->
keyvalue
->
contents
)[
i
]);
}
printf
(
"
\n
"
);
#else
printf
(
"%s
\n\t
[et%d:%d]: "
,
label
,
keyblk
->
enctype
,
keyblk
->
length
);
for
(
i
=
0
;
i
<
keyblk
->
length
;
i
++
)
for
(
i
=
0
;
i
<
(
int
)
keyblk
->
length
;
i
++
)
{
printf
(
"%02x"
,
keyblk
->
contents
[
i
]);
}
...
...
@@ -1010,12 +1016,12 @@ print_krb5_princ(char *label, krb5_principal_data *princ)
printf
(
"%s principal Realm: "
,
label
);
if
(
princ
==
NULL
)
return
;
for
(
ui
=
0
;
ui
<
princ
->
realm
.
length
;
ui
++
)
putchar
(
princ
->
realm
.
data
[
ui
]);
for
(
ui
=
0
;
ui
<
(
int
)
princ
->
realm
.
length
;
ui
++
)
putchar
(
princ
->
realm
.
data
[
ui
]);
printf
(
" (nametype %d) has %d strings:
\n
"
,
princ
->
type
,
princ
->
length
);
for
(
i
=
0
;
i
<
princ
->
length
;
i
++
)
for
(
i
=
0
;
i
<
(
int
)
princ
->
length
;
i
++
)
{
printf
(
"
\t
%d [%d]: "
,
i
,
princ
->
data
[
i
].
length
);
for
(
uj
=
0
;
uj
<
princ
->
data
[
i
].
length
;
uj
++
)
{
for
(
uj
=
0
;
uj
<
(
int
)
princ
->
data
[
i
].
length
;
uj
++
)
{
putchar
(
princ
->
data
[
i
].
data
[
uj
]);
}
printf
(
"
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
ssl/kssl.h
浏览文件 @
0858b71b
...
...
@@ -82,6 +82,12 @@ extern "C" {
#ifdef KRB5_HEIMDAL
typedef
unsigned
char
krb5_octet
;
#define FAR
#else
#ifndef FAR
#define FAR
#endif
#endif
/* Uncomment this to debug kssl problems or
...
...
This diff is collapsed.
Click to expand it.
ssl/s3_srvr.c
浏览文件 @
0858b71b
...
...
@@ -1850,8 +1850,8 @@ static int ssl3_get_client_key_exchange(SSL *s)
goto
err
;
}
if
(
n
!=
enc_ticket
.
length
+
authenticator
.
length
+
enc_pms
.
length
+
6
)
if
(
n
!=
(
long
)(
enc_ticket
.
length
+
authenticator
.
length
+
enc_pms
.
length
+
6
)
)
{
SSLerr
(
SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE
,
SSL_R_DATA_LENGTH_TOO_LONG
);
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部