Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
074309b7
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
9 个月 前同步成功
通知
8
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,体验更适合开发者的 AI 搜索 >>
提交
074309b7
编写于
9月 03, 1999
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix server behaviour when facing backwards-compatible client hellos.
上级
77fa04a9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
17 deletion
+54
-17
CHANGES
CHANGES
+5
-0
crypto/bio/bio.h
crypto/bio/bio.h
+2
-0
ssl/s23_pkt.c
ssl/s23_pkt.c
+1
-1
ssl/s23_srvr.c
ssl/s23_srvr.c
+42
-11
ssl/s3_srvr.c
ssl/s3_srvr.c
+4
-5
未找到文件。
CHANGES
浏览文件 @
074309b7
...
@@ -4,6 +4,11 @@
...
@@ -4,6 +4,11 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
*) Use client_version from client hello to select the protocol
(s23_srvr.c) and for RSA client key exchange verification
(s3_srvr.c), as required by the SSL 3.0/TLS 1.0 specifications.
[Bodo Moeller]
*) Add various utility functions to handle SPKACs, these were previously
*) Add various utility functions to handle SPKACs, these were previously
handled by poking round in the structure internals. Added new function
handled by poking round in the structure internals. Added new function
NETSCAPE_SPKI_print() to print out SPKAC and a new utility 'spkac' to
NETSCAPE_SPKI_print() to print out SPKAC and a new utility 'spkac' to
...
...
crypto/bio/bio.h
浏览文件 @
074309b7
...
@@ -517,10 +517,12 @@ BIO * BIO_get_retry_BIO(BIO *bio, int *reason);
...
@@ -517,10 +517,12 @@ BIO * BIO_get_retry_BIO(BIO *bio, int *reason);
int
BIO_get_retry_reason
(
BIO
*
bio
);
int
BIO_get_retry_reason
(
BIO
*
bio
);
BIO
*
BIO_dup_chain
(
BIO
*
in
);
BIO
*
BIO_dup_chain
(
BIO
*
in
);
#if 0 /* not yet */
int BIO_nread0(BIO *bio, char **buf);
int BIO_nread0(BIO *bio, char **buf);
int BIO_nread(BIO *bio, char **buf, int num);
int BIO_nread(BIO *bio, char **buf, int num);
int BIO_nwrite0(BIO *bio, char **buf);
int BIO_nwrite0(BIO *bio, char **buf);
int BIO_nwrite(BIO *bio, char **buf, int num);
int BIO_nwrite(BIO *bio, char **buf, int num);
#endif
#ifndef WIN16
#ifndef WIN16
long
BIO_debug_callback
(
BIO
*
bio
,
int
cmd
,
const
char
*
argp
,
int
argi
,
long
BIO_debug_callback
(
BIO
*
bio
,
int
cmd
,
const
char
*
argp
,
int
argi
,
...
...
ssl/s23_pkt.c
浏览文件 @
074309b7
...
@@ -89,7 +89,7 @@ int ssl23_write_bytes(SSL *s)
...
@@ -89,7 +89,7 @@ int ssl23_write_bytes(SSL *s)
}
}
}
}
/*
only return when we have read
'n' bytes */
/*
return regularly only when we have read (at least)
'n' bytes */
int
ssl23_read_bytes
(
SSL
*
s
,
int
n
)
int
ssl23_read_bytes
(
SSL
*
s
,
int
n
)
{
{
unsigned
char
*
p
;
unsigned
char
*
p
;
...
...
ssl/s23_srvr.c
浏览文件 @
074309b7
...
@@ -186,7 +186,7 @@ end:
...
@@ -186,7 +186,7 @@ end:
int
ssl23_get_client_hello
(
SSL
*
s
)
int
ssl23_get_client_hello
(
SSL
*
s
)
{
{
char
buf_space
[
8
];
char
buf_space
[
10
];
char
*
buf
=
&
(
buf_space
[
0
]);
char
*
buf
=
&
(
buf_space
[
0
]);
unsigned
char
*
p
,
*
d
,
*
dd
;
unsigned
char
*
p
,
*
d
,
*
dd
;
unsigned
int
i
;
unsigned
int
i
;
...
@@ -202,8 +202,8 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -202,8 +202,8 @@ int ssl23_get_client_hello(SSL *s)
if
(
!
ssl3_setup_buffers
(
s
))
goto
err
;
if
(
!
ssl3_setup_buffers
(
s
))
goto
err
;
n
=
ssl23_read_bytes
(
s
,
7
);
n
=
ssl23_read_bytes
(
s
,
10
);
if
(
n
!=
7
)
return
(
n
);
/* n == -1 || n == 0 */
if
(
n
!=
10
)
return
(
n
);
/* n == -1 || n == 0 */
p
=
s
->
packet
;
p
=
s
->
packet
;
...
@@ -211,7 +211,9 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -211,7 +211,9 @@ int ssl23_get_client_hello(SSL *s)
if
((
p
[
0
]
&
0x80
)
&&
(
p
[
2
]
==
SSL2_MT_CLIENT_HELLO
))
if
((
p
[
0
]
&
0x80
)
&&
(
p
[
2
]
==
SSL2_MT_CLIENT_HELLO
))
{
{
/* SSLv2 header */
/*
* SSLv2 header
*/
if
((
p
[
3
]
==
0x00
)
&&
(
p
[
4
]
==
0x02
))
if
((
p
[
3
]
==
0x00
)
&&
(
p
[
4
]
==
0x02
))
{
{
v
[
0
]
=
p
[
3
];
v
[
1
]
=
p
[
4
];
v
[
0
]
=
p
[
3
];
v
[
1
]
=
p
[
4
];
...
@@ -228,10 +230,12 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -228,10 +230,12 @@ int ssl23_get_client_hello(SSL *s)
if
(
!
(
s
->
options
&
SSL_OP_NO_TLSv1
))
if
(
!
(
s
->
options
&
SSL_OP_NO_TLSv1
))
{
{
tls1
=
1
;
tls1
=
1
;
/* type=2; */
/* done later to survive restarts */
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
}
}
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv3
))
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv3
))
{
{
/* type=2; */
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
}
}
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv2
))
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv2
))
...
@@ -240,12 +244,23 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -240,12 +244,23 @@ int ssl23_get_client_hello(SSL *s)
}
}
}
}
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv3
))
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv3
))
{
/* type=2; */
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
s
->
state
=
SSL23_ST_SR_CLNT_HELLO_B
;
}
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv2
))
else
if
(
!
(
s
->
options
&
SSL_OP_NO_SSLv2
))
type
=
1
;
type
=
1
;
if
(
s
->
options
&
SSL_OP_NON_EXPORT_FIRST
)
if
(
s
->
options
&
SSL_OP_NON_EXPORT_FIRST
)
/* not only confusing, but broken! */
/* Not only utterly confusing, but broken
* ('fractured programming'?) -- the details
* of this block nearly make it work
* as intended in this environment, but on one
* of the fine points (w.r.t. restarts) it fails.
* The obvious fix would be even more devastating
* to program structure; if you want the functionality,
* throw this away and implement it in a way
* that makes sense */
{
{
STACK_OF
(
SSL_CIPHER
)
*
sk
;
STACK_OF
(
SSL_CIPHER
)
*
sk
;
SSL_CIPHER
*
c
;
SSL_CIPHER
*
c
;
...
@@ -301,10 +316,20 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -301,10 +316,20 @@ int ssl23_get_client_hello(SSL *s)
}
}
else
if
((
p
[
0
]
==
SSL3_RT_HANDSHAKE
)
&&
else
if
((
p
[
0
]
==
SSL3_RT_HANDSHAKE
)
&&
(
p
[
1
]
==
SSL3_VERSION_MAJOR
)
&&
(
p
[
1
]
==
SSL3_VERSION_MAJOR
)
&&
(
p
[
5
]
==
SSL3_MT_CLIENT_HELLO
))
(
p
[
5
]
==
SSL3_MT_CLIENT_HELLO
)
&&
(
p
[
9
]
==
p
[
1
]))
{
{
v
[
0
]
=
p
[
1
];
v
[
1
]
=
p
[
2
];
/*
/* true SSLv3 or tls1 */
* SSLv3 or tls1 header
*/
/* we must look at client_version inside the client hello: */
n
=
ssl23_read_bytes
(
s
,
11
);
/* restarts are no problem here, stay in initial state */
if
(
n
!=
11
)
return
(
n
);
/* n == -1 || n == 0 */
v
[
0
]
=
p
[
9
];
v
[
1
]
=
p
[
10
];
if
(
p
[
2
]
>=
TLS1_VERSION_MINOR
)
if
(
p
[
2
]
>=
TLS1_VERSION_MINOR
)
{
{
if
(
!
(
s
->
options
&
SSL_OP_NO_TLSv1
))
if
(
!
(
s
->
options
&
SSL_OP_NO_TLSv1
))
...
@@ -336,7 +361,8 @@ int ssl23_get_client_hello(SSL *s)
...
@@ -336,7 +361,8 @@ int ssl23_get_client_hello(SSL *s)
next_bit:
next_bit:
if
(
s
->
state
==
SSL23_ST_SR_CLNT_HELLO_B
)
if
(
s
->
state
==
SSL23_ST_SR_CLNT_HELLO_B
)
{
{
/* we have a SSLv3/TLSv1 in a SSLv2 header */
/* we have a SSLv3/TLSv1 in a SSLv2 header
* (other cases skip this state)* */
type
=
2
;
type
=
2
;
p
=
s
->
packet
;
p
=
s
->
packet
;
v
[
0
]
=
p
[
3
];
v
[
0
]
=
p
[
3
];
...
@@ -406,6 +432,9 @@ next_bit:
...
@@ -406,6 +432,9 @@ next_bit:
s
->
s3
->
tmp
.
message_size
=
i
;
s
->
s3
->
tmp
.
message_size
=
i
;
}
}
/* imaginary new state (for program structure): */
/* s->state = SSL23_SR_CLNT_HELLO_C */
if
(
type
==
1
)
if
(
type
==
1
)
{
{
/* we are talking sslv2 */
/* we are talking sslv2 */
...
@@ -435,7 +464,7 @@ next_bit:
...
@@ -435,7 +464,7 @@ next_bit:
else
else
s
->
s2
->
ssl2_rollback
=
1
;
s
->
s2
->
ssl2_rollback
=
1
;
/* setup the
5
bytes we have read so we get them from
/* setup the
n
bytes we have read so we get them from
* the sslv2 buffer */
* the sslv2 buffer */
s
->
rstate
=
SSL_ST_READ_HEADER
;
s
->
rstate
=
SSL_ST_READ_HEADER
;
s
->
packet_length
=
n
;
s
->
packet_length
=
n
;
...
@@ -450,7 +479,7 @@ next_bit:
...
@@ -450,7 +479,7 @@ next_bit:
if
((
type
==
2
)
||
(
type
==
3
))
if
((
type
==
2
)
||
(
type
==
3
))
{
{
/* we have SSLv3/TLSv1 */
/* we have SSLv3/TLSv1
(type 2: SSL2 style, type 3: SSL3/TLS style)
*/
if
(
!
ssl_init_wbio_buffer
(
s
,
1
))
goto
err
;
if
(
!
ssl_init_wbio_buffer
(
s
,
1
))
goto
err
;
...
@@ -485,7 +514,9 @@ next_bit:
...
@@ -485,7 +514,9 @@ next_bit:
s
->
version
=
SSL3_VERSION
;
s
->
version
=
SSL3_VERSION
;
s
->
method
=
SSLv3_server_method
();
s
->
method
=
SSLv3_server_method
();
}
}
#if 0 /* ssl3_get_client_hello does this */
s->client_version=(v[0]<<8)|v[1];
s->client_version=(v[0]<<8)|v[1];
#endif
s
->
handshake_func
=
s
->
method
->
ssl_accept
;
s
->
handshake_func
=
s
->
method
->
ssl_accept
;
}
}
...
...
ssl/s3_srvr.c
浏览文件 @
074309b7
...
@@ -531,10 +531,9 @@ static int ssl3_get_client_hello(SSL *s)
...
@@ -531,10 +531,9 @@ static int ssl3_get_client_hello(SSL *s)
if
(
!
ok
)
return
((
int
)
n
);
if
(
!
ok
)
return
((
int
)
n
);
d
=
p
=
(
unsigned
char
*
)
s
->
init_buf
->
data
;
d
=
p
=
(
unsigned
char
*
)
s
->
init_buf
->
data
;
/* The version number has already been checked in ssl3_get_message.
/* use version from inside client hello, not from record header
* I a native TLSv1/SSLv3 method, the match must be correct except
* (may differ: see RFC 2246, Appendix E, second paragraph) */
* perhaps for the first message */
s
->
client_version
=
(((
int
)
p
[
0
])
<<
8
)
|
(
int
)
p
[
1
];
/* s->client_version=(((int)p[0])<<8)|(int)p[1]; */
p
+=
2
;
p
+=
2
;
/* load the client random */
/* load the client random */
...
@@ -1239,7 +1238,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
...
@@ -1239,7 +1238,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
i
=
RSA_private_decrypt
((
int
)
n
,
p
,
p
,
rsa
,
RSA_PKCS1_PADDING
);
i
=
RSA_private_decrypt
((
int
)
n
,
p
,
p
,
rsa
,
RSA_PKCS1_PADDING
);
#if
1
#if
0
/* If a bad decrypt, use a random master key */
/* If a bad decrypt, use a random master key */
if ((i != SSL_MAX_MASTER_KEY_LENGTH) ||
if ((i != SSL_MAX_MASTER_KEY_LENGTH) ||
((p[0] != (s->client_version>>8)) ||
((p[0] != (s->client_version>>8)) ||
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录