Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2893a302
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,发现更多精彩内容 >>
提交
2893a302
编写于
8月 20, 2014
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
crypto/evp/e_aes_cbc_hmac_sha[1|256].c: fix compiler warnings.
Reviewed-by:
N
Dr. Stephen Henson
<
steve@openssl.org
>
上级
55eb14da
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
0 deletion
+39
-0
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/evp/e_aes_cbc_hmac_sha1.c
+18
-0
crypto/evp/e_aes_cbc_hmac_sha256.c
crypto/evp/e_aes_cbc_hmac_sha256.c
+21
-0
未找到文件。
crypto/evp/e_aes_cbc_hmac_sha1.c
浏览文件 @
2893a302
...
...
@@ -330,10 +330,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
len
+=
64
+
13
;
/* 64 is HMAC header */
len
*=
8
;
/* convert to bits */
if
(
off
<
(
64
-
8
))
{
#ifdef BSWAP4
blocks
[
i
].
d
[
15
]
=
BSWAP4
(
len
);
#else
PUTU32
(
blocks
[
i
].
c
+
60
,
len
);
#endif
edges
[
i
].
blocks
=
1
;
}
else
{
#ifdef BSWAP4
blocks
[
i
].
d
[
31
]
=
BSWAP4
(
len
);
#else
PUTU32
(
blocks
[
i
].
c
+
124
,
len
);
#endif
edges
[
i
].
blocks
=
2
;
}
edges
[
i
].
ptr
=
blocks
[
i
].
c
;
...
...
@@ -344,6 +352,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
memset
(
blocks
,
0
,
sizeof
(
blocks
));
for
(
i
=
0
;
i
<
x4
;
i
++
)
{
#ifdef BSWAP4
blocks
[
i
].
d
[
0
]
=
BSWAP4
(
ctx
->
A
[
i
]);
ctx
->
A
[
i
]
=
key
->
tail
.
h0
;
blocks
[
i
].
d
[
1
]
=
BSWAP4
(
ctx
->
B
[
i
]);
ctx
->
B
[
i
]
=
key
->
tail
.
h1
;
blocks
[
i
].
d
[
2
]
=
BSWAP4
(
ctx
->
C
[
i
]);
ctx
->
C
[
i
]
=
key
->
tail
.
h2
;
blocks
[
i
].
d
[
3
]
=
BSWAP4
(
ctx
->
D
[
i
]);
ctx
->
D
[
i
]
=
key
->
tail
.
h3
;
blocks
[
i
].
d
[
4
]
=
BSWAP4
(
ctx
->
E
[
i
]);
ctx
->
E
[
i
]
=
key
->
tail
.
h4
;
blocks
[
i
].
c
[
20
]
=
0x80
;
blocks
[
i
].
d
[
15
]
=
BSWAP4
((
64
+
20
)
*
8
);
#else
PUTU32
(
blocks
[
i
].
c
+
0
,
ctx
->
A
[
i
]);
ctx
->
A
[
i
]
=
key
->
tail
.
h0
;
PUTU32
(
blocks
[
i
].
c
+
4
,
ctx
->
B
[
i
]);
ctx
->
B
[
i
]
=
key
->
tail
.
h1
;
PUTU32
(
blocks
[
i
].
c
+
8
,
ctx
->
C
[
i
]);
ctx
->
C
[
i
]
=
key
->
tail
.
h2
;
...
...
@@ -351,6 +368,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
PUTU32
(
blocks
[
i
].
c
+
16
,
ctx
->
E
[
i
]);
ctx
->
E
[
i
]
=
key
->
tail
.
h4
;
blocks
[
i
].
c
[
20
]
=
0x80
;
PUTU32
(
blocks
[
i
].
c
+
60
,(
64
+
20
)
*
8
);
#endif
edges
[
i
].
ptr
=
blocks
[
i
].
c
;
edges
[
i
].
blocks
=
1
;
}
...
...
crypto/evp/e_aes_cbc_hmac_sha256.c
浏览文件 @
2893a302
...
...
@@ -329,10 +329,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
len
+=
64
+
13
;
/* 64 is HMAC header */
len
*=
8
;
/* convert to bits */
if
(
off
<
(
64
-
8
))
{
#ifdef BSWAP4
blocks
[
i
].
d
[
15
]
=
BSWAP4
(
len
);
#else
PUTU32
(
blocks
[
i
].
c
+
60
,
len
);
#endif
edges
[
i
].
blocks
=
1
;
}
else
{
#ifdef BSWAP4
blocks
[
i
].
d
[
31
]
=
BSWAP4
(
len
);
#else
PUTU32
(
blocks
[
i
].
c
+
124
,
len
);
#endif
edges
[
i
].
blocks
=
2
;
}
edges
[
i
].
ptr
=
blocks
[
i
].
c
;
...
...
@@ -343,6 +351,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
memset
(
blocks
,
0
,
sizeof
(
blocks
));
for
(
i
=
0
;
i
<
x4
;
i
++
)
{
#ifdef BSWAP4
blocks
[
i
].
d
[
0
]
=
BSWAP4
(
ctx
->
A
[
i
]);
ctx
->
A
[
i
]
=
key
->
tail
.
h
[
0
];
blocks
[
i
].
d
[
1
]
=
BSWAP4
(
ctx
->
B
[
i
]);
ctx
->
B
[
i
]
=
key
->
tail
.
h
[
1
];
blocks
[
i
].
d
[
2
]
=
BSWAP4
(
ctx
->
C
[
i
]);
ctx
->
C
[
i
]
=
key
->
tail
.
h
[
2
];
blocks
[
i
].
d
[
3
]
=
BSWAP4
(
ctx
->
D
[
i
]);
ctx
->
D
[
i
]
=
key
->
tail
.
h
[
3
];
blocks
[
i
].
d
[
4
]
=
BSWAP4
(
ctx
->
E
[
i
]);
ctx
->
E
[
i
]
=
key
->
tail
.
h
[
4
];
blocks
[
i
].
d
[
5
]
=
BSWAP4
(
ctx
->
F
[
i
]);
ctx
->
F
[
i
]
=
key
->
tail
.
h
[
5
];
blocks
[
i
].
d
[
6
]
=
BSWAP4
(
ctx
->
G
[
i
]);
ctx
->
G
[
i
]
=
key
->
tail
.
h
[
6
];
blocks
[
i
].
d
[
7
]
=
BSWAP4
(
ctx
->
H
[
i
]);
ctx
->
H
[
i
]
=
key
->
tail
.
h
[
7
];
blocks
[
i
].
c
[
32
]
=
0x80
;
blocks
[
i
].
d
[
15
]
=
BSWAP4
((
64
+
32
)
*
8
);
#else
PUTU32
(
blocks
[
i
].
c
+
0
,
ctx
->
A
[
i
]);
ctx
->
A
[
i
]
=
key
->
tail
.
h
[
0
];
PUTU32
(
blocks
[
i
].
c
+
4
,
ctx
->
B
[
i
]);
ctx
->
B
[
i
]
=
key
->
tail
.
h
[
1
];
PUTU32
(
blocks
[
i
].
c
+
8
,
ctx
->
C
[
i
]);
ctx
->
C
[
i
]
=
key
->
tail
.
h
[
2
];
...
...
@@ -353,6 +373,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
PUTU32
(
blocks
[
i
].
c
+
28
,
ctx
->
H
[
i
]);
ctx
->
H
[
i
]
=
key
->
tail
.
h
[
7
];
blocks
[
i
].
c
[
32
]
=
0x80
;
PUTU32
(
blocks
[
i
].
c
+
60
,(
64
+
32
)
*
8
);
#endif
edges
[
i
].
ptr
=
blocks
[
i
].
c
;
edges
[
i
].
blocks
=
1
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录