Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
98fa4fe8
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98fa4fe8
编写于
3月 12, 2002
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ASN1 additions for KRB5
上级
0b4c91c0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
18 deletion
+32
-18
ssl/ssl.h
ssl/ssl.h
+1
-0
ssl/ssl_asn1.c
ssl/ssl_asn1.c
+29
-16
ssl/ssl_txt.c
ssl/ssl_txt.c
+2
-2
未找到文件。
ssl/ssl.h
浏览文件 @
98fa4fe8
...
...
@@ -358,6 +358,7 @@ typedef struct ssl_method_st
* Cipher OCTET_STRING, -- the 3 byte cipher ID
* Session_ID OCTET_STRING, -- the Session ID
* Master_key OCTET_STRING, -- the master key
* KRB5_principal OCTET_STRING -- optional Kerberos principal
* Key_Arg [ 0 ] IMPLICIT OCTET_STRING, -- the optional Key argument
* Time [ 1 ] EXPLICIT INTEGER, -- optional Start Time
* Timeout [ 2 ] EXPLICIT INTEGER, -- optional Timeout ins seconds
...
...
ssl/ssl_asn1.c
浏览文件 @
98fa4fe8
...
...
@@ -146,9 +146,12 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
a
.
key_arg
.
data
=
in
->
key_arg
;
#ifndef OPENSSL_NO_KRB5
a
.
krb5_princ
.
length
=
in
->
krb5_client_princ_len
;
a
.
krb5_princ
.
type
=
V_ASN1_OCTET_STRING
;
a
.
krb5_princ
.
data
=
in
->
krb5_client_princ
;
if
(
in
->
krb5_client_princ_len
)
{
a
.
krb5_princ
.
length
=
in
->
krb5_client_princ_len
;
a
.
krb5_princ
.
type
=
V_ASN1_OCTET_STRING
;
a
.
krb5_princ
.
data
=
in
->
krb5_client_princ
;
}
#endif
/* OPENSSL_NO_KRB5 */
if
(
in
->
time
!=
0L
)
...
...
@@ -182,7 +185,8 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
M_ASN1_I2D_len
(
&
(
a
.
session_id
),
i2d_ASN1_OCTET_STRING
);
M_ASN1_I2D_len
(
&
(
a
.
master_key
),
i2d_ASN1_OCTET_STRING
);
#ifndef OPENSSL_NO_KRB5
M_ASN1_I2D_len
(
&
(
a
.
krb5_princ
),
i2d_ASN1_OCTET_STRING
);
if
(
in
->
krb5_client_princ_len
)
M_ASN1_I2D_len
(
&
(
a
.
krb5_princ
),
i2d_ASN1_OCTET_STRING
);
#endif
/* OPENSSL_NO_KRB5 */
if
(
in
->
key_arg_length
>
0
)
M_ASN1_I2D_len_IMP_opt
(
&
(
a
.
key_arg
),
i2d_ASN1_OCTET_STRING
);
...
...
@@ -204,7 +208,8 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
M_ASN1_I2D_put
(
&
(
a
.
session_id
),
i2d_ASN1_OCTET_STRING
);
M_ASN1_I2D_put
(
&
(
a
.
master_key
),
i2d_ASN1_OCTET_STRING
);
#ifndef OPENSSL_NO_KRB5
M_ASN1_I2D_put
(
&
(
a
.
krb5_princ
),
i2d_ASN1_OCTET_STRING
);
if
(
in
->
krb5_client_princ_len
)
M_ASN1_I2D_put
(
&
(
a
.
krb5_princ
),
i2d_ASN1_OCTET_STRING
);
#endif
/* OPENSSL_NO_KRB5 */
if
(
in
->
key_arg_length
>
0
)
M_ASN1_I2D_put_IMP_opt
(
&
(
a
.
key_arg
),
i2d_ASN1_OCTET_STRING
,
0
);
...
...
@@ -301,6 +306,25 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
memcpy
(
ret
->
master_key
,
os
.
data
,
ret
->
master_key_length
);
os
.
length
=
0
;
#ifndef OPENSSL_NO_KRB5
os
.
length
=
0
;
M_ASN1_D2I_get_opt
(
osp
,
d2i_ASN1_OCTET_STRING
,
V_ASN1_OCTET_STRING
);
if
(
os
.
data
)
{
if
(
os
.
length
>
SSL_MAX_KRB5_PRINCIPAL_LENGTH
)
ret
->
krb5_client_princ_len
=
0
;
else
ret
->
krb5_client_princ_len
=
os
.
length
;
memcpy
(
ret
->
krb5_client_princ
,
os
.
data
,
ret
->
krb5_client_princ_len
);
OPENSSL_free
(
os
.
data
);
os
.
data
=
NULL
;
os
.
length
=
0
;
}
else
ret
->
krb5_client_princ_len
=
0
;
#endif
/* OPENSSL_NO_KRB5 */
M_ASN1_D2I_get_IMP_opt
(
osp
,
d2i_ASN1_OCTET_STRING
,
0
,
V_ASN1_OCTET_STRING
);
if
(
os
.
length
>
SSL_MAX_KEY_ARG_LENGTH
)
ret
->
key_arg_length
=
SSL_MAX_KEY_ARG_LENGTH
;
...
...
@@ -309,17 +333,6 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
memcpy
(
ret
->
key_arg
,
os
.
data
,
ret
->
key_arg_length
);
if
(
os
.
data
!=
NULL
)
OPENSSL_free
(
os
.
data
);
#ifndef OPENSSL_NO_KRB5
os
.
length
=
0
;
M_ASN1_D2I_get_IMP_opt
(
osp
,
d2i_ASN1_OCTET_STRING
,
0
,
V_ASN1_OCTET_STRING
);
if
(
os
.
length
>
SSL_MAX_KRB5_PRINCIPAL_LENGTH
)
ret
->
krb5_client_princ_len
=
0
;
else
ret
->
krb5_client_princ_len
=
os
.
length
;
memcpy
(
ret
->
krb5_client_princ
,
os
.
data
,
ret
->
krb5_client_princ_len
);
if
(
os
.
data
!=
NULL
)
OPENSSL_free
(
os
.
data
);
#endif
/* OPENSSL_NO_KRB5 */
ai
.
length
=
0
;
M_ASN1_D2I_get_EXP_opt
(
aip
,
d2i_ASN1_INTEGER
,
1
);
if
(
ai
.
data
!=
NULL
)
...
...
ssl/ssl_txt.c
浏览文件 @
98fa4fe8
...
...
@@ -140,7 +140,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
if
(
BIO_printf
(
bp
,
"%02X"
,
x
->
key_arg
[
i
])
<=
0
)
goto
err
;
}
#ifndef OPENSSL_NO_KRB5
if
(
BIO_puts
(
bp
,
"
/
n Krb5 Principal: "
)
<=
0
)
goto
err
;
if
(
BIO_puts
(
bp
,
"
\
n
Krb5 Principal: "
)
<=
0
)
goto
err
;
if
(
x
->
krb5_client_princ_len
==
0
)
{
if
(
BIO_puts
(
bp
,
"None"
)
<=
0
)
goto
err
;
...
...
@@ -148,7 +148,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
else
for
(
i
=
0
;
i
<
x
->
krb5_client_princ_len
;
i
++
)
{
if
(
BIO_printf
(
bp
,
"%02X"
,
x
->
k
ey_arg
[
i
])
<=
0
)
goto
err
;
if
(
BIO_printf
(
bp
,
"%02X"
,
x
->
k
rb5_client_princ
[
i
])
<=
0
)
goto
err
;
}
#endif
/* OPENSSL_NO_KRB5 */
if
(
x
->
compress_meth
!=
0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录