Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
87739b2c
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
87739b2c
编写于
11月 28, 2000
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Disable SSL_peek until it is fixed.
上级
c7820896
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
16 addition
and
2 deletion
+16
-2
ssl/s2_pkt.c
ssl/s2_pkt.c
+5
-1
ssl/s3_lib.c
ssl/s3_lib.c
+5
-1
ssl/ssl.h
ssl/ssl.h
+3
-0
ssl/ssl_err.c
ssl/ssl_err.c
+3
-0
未找到文件。
ssl/s2_pkt.c
浏览文件 @
87739b2c
...
@@ -68,9 +68,12 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len);
...
@@ -68,9 +68,12 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len);
static
int
ssl_mt_error
(
int
n
);
static
int
ssl_mt_error
(
int
n
);
int
ssl2_peek
(
SSL
*
s
,
char
*
buf
,
int
len
)
int
ssl2_peek
(
SSL
*
s
,
char
*
buf
,
int
len
)
{
{
#if 1
SSLerr
(
SSL_F_SSL2_PEEK
,
SSL_R_FIXME
);
/* function is totally broken */
return
-
1
;
#else
int
ret
;
int
ret
;
/* FIXME */
ret
=
ssl2_read
(
s
,
buf
,
len
);
ret
=
ssl2_read
(
s
,
buf
,
len
);
if
(
ret
>
0
)
if
(
ret
>
0
)
{
{
...
@@ -78,6 +81,7 @@ int ssl2_peek(SSL *s, char *buf, int len)
...
@@ -78,6 +81,7 @@ int ssl2_peek(SSL *s, char *buf, int len)
s
->
s2
->
ract_data
-=
ret
;
s
->
s2
->
ract_data
-=
ret
;
}
}
return
(
ret
);
return
(
ret
);
#endif
}
}
/* SSL_read -
/* SSL_read -
...
...
ssl/s3_lib.c
浏览文件 @
87739b2c
...
@@ -1280,10 +1280,13 @@ int ssl3_read(SSL *s, void *buf, int len)
...
@@ -1280,10 +1280,13 @@ int ssl3_read(SSL *s, void *buf, int len)
int
ssl3_peek
(
SSL
*
s
,
char
*
buf
,
int
len
)
int
ssl3_peek
(
SSL
*
s
,
char
*
buf
,
int
len
)
{
{
#if 1
SSLerr
(
SSL_F_SSL3_PEEK
,
SSL_R_FIXME
);
/* function is totally broken */
return
-
1
;
#else
SSL3_RECORD
*
rr
;
SSL3_RECORD
*
rr
;
int
n
;
int
n
;
/* FIXME */
rr
=
&
(
s
->
s3
->
rrec
);
rr
=
&
(
s
->
s3
->
rrec
);
if
((
rr
->
length
==
0
)
||
(
rr
->
type
!=
SSL3_RT_APPLICATION_DATA
))
if
((
rr
->
length
==
0
)
||
(
rr
->
type
!=
SSL3_RT_APPLICATION_DATA
))
{
{
...
@@ -1299,6 +1302,7 @@ int ssl3_peek(SSL *s, char *buf, int len)
...
@@ -1299,6 +1302,7 @@ int ssl3_peek(SSL *s, char *buf, int len)
n
=
len
;
n
=
len
;
memcpy
(
buf
,
&
(
rr
->
data
[
rr
->
off
]),(
unsigned
int
)
n
);
memcpy
(
buf
,
&
(
rr
->
data
[
rr
->
off
]),(
unsigned
int
)
n
);
return
(
n
);
return
(
n
);
#endif
}
}
int
ssl3_renegotiate
(
SSL
*
s
)
int
ssl3_renegotiate
(
SSL
*
s
)
...
...
ssl/ssl.h
浏览文件 @
87739b2c
...
@@ -1239,6 +1239,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
...
@@ -1239,6 +1239,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
#define SSL_F_SSL2_ACCEPT 122
#define SSL_F_SSL2_ACCEPT 122
#define SSL_F_SSL2_CONNECT 123
#define SSL_F_SSL2_CONNECT 123
#define SSL_F_SSL2_ENC_INIT 124
#define SSL_F_SSL2_ENC_INIT 124
#define SSL_F_SSL2_PEEK 234
#define SSL_F_SSL2_READ 125
#define SSL_F_SSL2_READ 125
#define SSL_F_SSL2_SET_CERTIFICATE 126
#define SSL_F_SSL2_SET_CERTIFICATE 126
#define SSL_F_SSL2_WRITE 127
#define SSL_F_SSL2_WRITE 127
...
@@ -1264,6 +1265,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
...
@@ -1264,6 +1265,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
#define SSL_F_SSL3_GET_SERVER_DONE 145
#define SSL_F_SSL3_GET_SERVER_DONE 145
#define SSL_F_SSL3_GET_SERVER_HELLO 146
#define SSL_F_SSL3_GET_SERVER_HELLO 146
#define SSL_F_SSL3_OUTPUT_CERT_CHAIN 147
#define SSL_F_SSL3_OUTPUT_CERT_CHAIN 147
#define SSL_F_SSL3_PEEK 235
#define SSL_F_SSL3_READ_BYTES 148
#define SSL_F_SSL3_READ_BYTES 148
#define SSL_F_SSL3_READ_N 149
#define SSL_F_SSL3_READ_N 149
#define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST 150
#define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST 150
...
@@ -1406,6 +1408,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
...
@@ -1406,6 +1408,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151
#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151
#define SSL_R_EXCESSIVE_MESSAGE_SIZE 152
#define SSL_R_EXCESSIVE_MESSAGE_SIZE 152
#define SSL_R_EXTRA_DATA_IN_MESSAGE 153
#define SSL_R_EXTRA_DATA_IN_MESSAGE 153
#define SSL_R_FIXME 1101
#define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
#define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
#define SSL_R_HTTPS_PROXY_REQUEST 155
#define SSL_R_HTTPS_PROXY_REQUEST 155
#define SSL_R_HTTP_REQUEST 156
#define SSL_R_HTTP_REQUEST 156
...
...
ssl/ssl_err.c
浏览文件 @
87739b2c
...
@@ -91,6 +91,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
...
@@ -91,6 +91,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{
ERR_PACK
(
0
,
SSL_F_SSL2_ACCEPT
,
0
),
"SSL2_ACCEPT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_ACCEPT
,
0
),
"SSL2_ACCEPT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_CONNECT
,
0
),
"SSL2_CONNECT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_CONNECT
,
0
),
"SSL2_CONNECT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_ENC_INIT
,
0
),
"SSL2_ENC_INIT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_ENC_INIT
,
0
),
"SSL2_ENC_INIT"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_PEEK
,
0
),
"SSL2_PEEK"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_READ
,
0
),
"SSL2_READ"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_READ
,
0
),
"SSL2_READ"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_SET_CERTIFICATE
,
0
),
"SSL2_SET_CERTIFICATE"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_SET_CERTIFICATE
,
0
),
"SSL2_SET_CERTIFICATE"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_WRITE
,
0
),
"SSL2_WRITE"
},
{
ERR_PACK
(
0
,
SSL_F_SSL2_WRITE
,
0
),
"SSL2_WRITE"
},
...
@@ -116,6 +117,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
...
@@ -116,6 +117,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{
ERR_PACK
(
0
,
SSL_F_SSL3_GET_SERVER_DONE
,
0
),
"SSL3_GET_SERVER_DONE"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_GET_SERVER_DONE
,
0
),
"SSL3_GET_SERVER_DONE"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_GET_SERVER_HELLO
,
0
),
"SSL3_GET_SERVER_HELLO"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_GET_SERVER_HELLO
,
0
),
"SSL3_GET_SERVER_HELLO"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_OUTPUT_CERT_CHAIN
,
0
),
"SSL3_OUTPUT_CERT_CHAIN"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_OUTPUT_CERT_CHAIN
,
0
),
"SSL3_OUTPUT_CERT_CHAIN"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_PEEK
,
0
),
"SSL3_PEEK"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_READ_BYTES
,
0
),
"SSL3_READ_BYTES"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_READ_BYTES
,
0
),
"SSL3_READ_BYTES"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_READ_N
,
0
),
"SSL3_READ_N"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_READ_N
,
0
),
"SSL3_READ_N"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_SEND_CERTIFICATE_REQUEST
,
0
),
"SSL3_SEND_CERTIFICATE_REQUEST"
},
{
ERR_PACK
(
0
,
SSL_F_SSL3_SEND_CERTIFICATE_REQUEST
,
0
),
"SSL3_SEND_CERTIFICATE_REQUEST"
},
...
@@ -261,6 +263,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
...
@@ -261,6 +263,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{
SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST
,
"error in received cipher list"
},
{
SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST
,
"error in received cipher list"
},
{
SSL_R_EXCESSIVE_MESSAGE_SIZE
,
"excessive message size"
},
{
SSL_R_EXCESSIVE_MESSAGE_SIZE
,
"excessive message size"
},
{
SSL_R_EXTRA_DATA_IN_MESSAGE
,
"extra data in message"
},
{
SSL_R_EXTRA_DATA_IN_MESSAGE
,
"extra data in message"
},
{
SSL_R_FIXME
,
"FIXME"
},
{
SSL_R_GOT_A_FIN_BEFORE_A_CCS
,
"got a fin before a ccs"
},
{
SSL_R_GOT_A_FIN_BEFORE_A_CCS
,
"got a fin before a ccs"
},
{
SSL_R_HTTPS_PROXY_REQUEST
,
"https proxy request"
},
{
SSL_R_HTTPS_PROXY_REQUEST
,
"https proxy request"
},
{
SSL_R_HTTP_REQUEST
,
"http request"
},
{
SSL_R_HTTP_REQUEST
,
"http request"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录