Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
f4bd5de5
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
f4bd5de5
编写于
10月 05, 2015
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Address more Windows warnings illuminated by mingw.
Reviewed-by:
N
Rich Salz
<
rsalz@openssl.org
>
上级
52ee3ed3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
10 deletion
+14
-10
include/openssl/e_os2.h
include/openssl/e_os2.h
+6
-2
ssl/record/rec_layer_s3.c
ssl/record/rec_layer_s3.c
+8
-8
未找到文件。
include/openssl/e_os2.h
浏览文件 @
f4bd5de5
...
...
@@ -262,8 +262,12 @@ extern "C" {
# define OPENSSL_GLOBAL_REF(name) _shadow_##name
# endif
# ifdef OPENSSL_SYS_MSDOS
# define ossl_ssize_t long
# ifdef _WIN32
# ifdef _WIN64
# define ossl_ssize_t __int64
# else
# define ossl_ssize_t int
# endif
# endif
# if defined(__ultrix) && !defined(ssize_t)
...
...
ssl/record/rec_layer_s3.c
浏览文件 @
f4bd5de5
...
...
@@ -293,7 +293,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
* s->packet_length bytes if extend == 1].)
*/
int
i
,
len
,
left
;
long
align
=
0
;
size_t
align
=
0
;
unsigned
char
*
pkt
;
SSL3_BUFFER
*
rb
;
...
...
@@ -307,8 +307,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
left
=
rb
->
left
;
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
align
=
(
long
)
rb
->
buf
+
SSL3_RT_HEADER_LENGTH
;
align
=
(
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
align
=
(
size_t
)
rb
->
buf
+
SSL3_RT_HEADER_LENGTH
;
align
=
(
0
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
#endif
if
(
!
extend
)
{
...
...
@@ -673,7 +673,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
int
i
,
mac_size
,
clear
=
0
;
int
prefix_len
=
0
;
int
eivlen
;
long
align
=
0
;
size_t
align
=
0
;
SSL3_RECORD
*
wr
;
SSL3_BUFFER
*
wb
=
&
s
->
rlayer
.
wbuf
;
SSL_SESSION
*
sess
;
...
...
@@ -753,8 +753,8 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
* multiple of SSL3_ALIGN_PAYLOAD, so if we want to align the real
* payload, then we can just pretent we simply have two headers.
*/
align
=
(
long
)
SSL3_BUFFER_get_buf
(
wb
)
+
2
*
SSL3_RT_HEADER_LENGTH
;
align
=
(
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
align
=
(
size_t
)
SSL3_BUFFER_get_buf
(
wb
)
+
2
*
SSL3_RT_HEADER_LENGTH
;
align
=
(
0
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
#endif
p
=
SSL3_BUFFER_get_buf
(
wb
)
+
align
;
SSL3_BUFFER_set_offset
(
wb
,
align
);
...
...
@@ -762,8 +762,8 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
p
=
SSL3_BUFFER_get_buf
(
wb
)
+
SSL3_BUFFER_get_offset
(
wb
)
+
prefix_len
;
}
else
{
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
align
=
(
long
)
SSL3_BUFFER_get_buf
(
wb
)
+
SSL3_RT_HEADER_LENGTH
;
align
=
(
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
align
=
(
size_t
)
SSL3_BUFFER_get_buf
(
wb
)
+
SSL3_RT_HEADER_LENGTH
;
align
=
(
0
-
align
)
&
(
SSL3_ALIGN_PAYLOAD
-
1
);
#endif
p
=
SSL3_BUFFER_get_buf
(
wb
)
+
align
;
SSL3_BUFFER_set_offset
(
wb
,
align
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录