Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
502aef5a
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
502aef5a
编写于
12月 02, 2006
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eliminate redundant variable in Camellia CBC routine.
上级
9f8cfb1c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
47 addition
and
55 deletion
+47
-55
crypto/camellia/cmll_cbc.c
crypto/camellia/cmll_cbc.c
+47
-55
未找到文件。
crypto/camellia/cmll_cbc.c
浏览文件 @
502aef5a
...
...
@@ -67,9 +67,9 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
unsigned
long
n
;
unsigned
long
len
=
length
;
unsigned
char
tmp
[
CAMELLIA_BLOCK_SIZE
];
const
unsigned
char
*
iv
=
ivec
;
u32
t32
[
CAMELLIA_BLOCK_SIZE
/
sizeof
(
u32
)];
union
{
u32
t32
[
CAMELLIA_BLOCK_SIZE
/
sizeof
(
u32
)];
u8
t8
[
CAMELLIA_BLOCK_SIZE
];
}
tmp
;
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
...
...
@@ -127,14 +127,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
}
if
(
len
)
{
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
(
u32
*
)
tmp
);
key
->
dec
(
key
->
rd_key
,
(
u32
*
)
tmp
);
SWAP4WORD
(
tmp
.
t32
);
key
->
dec
(
key
->
rd_key
,
tmp
.
t32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
(
u32
*
)
tmp
);
SWAP4WORD
(
tmp
.
t32
);
for
(
n
=
0
;
n
<
len
;
++
n
)
out
[
n
]
=
tmp
[
n
]
^
iv
[
n
];
out
[
n
]
=
tmp
.
t8
[
n
]
^
iv
[
n
];
iv
=
in
;
}
memcpy
(
ivec
,
iv
,
CAMELLIA_BLOCK_SIZE
);
...
...
@@ -143,21 +143,21 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
{
while
(
len
>=
CAMELLIA_BLOCK_SIZE
)
{
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
((
u32
*
)
out
);
key
->
dec
(
key
->
rd_key
,
(
u32
*
)
out
);
if
(
camellia_endian
.
little
)
SWAP4WORD
((
u32
*
)
out
);
XOR4WORD
((
u32
*
)
out
,
(
u32
*
)
ivec
);
memcpy
(
ivec
,
tmp
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
ivec
,
tmp
.
t8
,
CAMELLIA_BLOCK_SIZE
);
len
-=
CAMELLIA_BLOCK_SIZE
;
in
+=
CAMELLIA_BLOCK_SIZE
;
out
+=
CAMELLIA_BLOCK_SIZE
;
}
if
(
len
)
{
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
((
u32
*
)
out
);
key
->
dec
(
key
->
rd_key
,(
u32
*
)
out
);
...
...
@@ -166,8 +166,8 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
for
(
n
=
0
;
n
<
len
;
++
n
)
out
[
n
]
^=
ivec
[
n
];
for
(
n
=
len
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
=
tmp
[
n
];
memcpy
(
ivec
,
tmp
,
CAMELLIA_BLOCK_SIZE
);
out
[
n
]
=
tmp
.
t8
[
n
];
memcpy
(
ivec
,
tmp
.
t8
,
CAMELLIA_BLOCK_SIZE
);
}
}
}
...
...
@@ -178,14 +178,13 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
while
(
len
>=
CAMELLIA_BLOCK_SIZE
)
{
for
(
n
=
0
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
=
in
[
n
]
^
iv
[
n
];
memcpy
(
t32
,
out
,
CAMELLIA_BLOCK_SIZE
);
tmp
.
t8
[
n
]
=
in
[
n
]
^
iv
[
n
];
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
enc
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
enc
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t
32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
t
mp
.
t
32
);
memcpy
(
out
,
t
mp
.
t8
,
CAMELLIA_BLOCK_SIZE
);
iv
=
out
;
len
-=
CAMELLIA_BLOCK_SIZE
;
in
+=
CAMELLIA_BLOCK_SIZE
;
...
...
@@ -194,16 +193,15 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
if
(
len
)
{
for
(
n
=
0
;
n
<
len
;
++
n
)
out
[
n
]
=
in
[
n
]
^
iv
[
n
];
tmp
.
t8
[
n
]
=
in
[
n
]
^
iv
[
n
];
for
(
n
=
len
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
=
iv
[
n
];
memcpy
(
t32
,
out
,
CAMELLIA_BLOCK_SIZE
);
tmp
.
t8
[
n
]
=
iv
[
n
];
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
enc
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
enc
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t
32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
t
mp
.
t
32
);
memcpy
(
out
,
t
mp
.
t8
,
CAMELLIA_BLOCK_SIZE
);
iv
=
out
;
}
memcpy
(
ivec
,
iv
,
CAMELLIA_BLOCK_SIZE
);
...
...
@@ -212,15 +210,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
{
while
(
len
>=
CAMELLIA_BLOCK_SIZE
)
{
memcpy
(
t
32
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
t
mp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
dec
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
dec
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
tmp
.
t32
);
for
(
n
=
0
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
^=
iv
[
n
];
out
[
n
]
=
tmp
.
t8
[
n
]
^
iv
[
n
];
iv
=
in
;
len
-=
CAMELLIA_BLOCK_SIZE
;
in
+=
CAMELLIA_BLOCK_SIZE
;
...
...
@@ -228,15 +225,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
}
if
(
len
)
{
memcpy
(
t
32
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
t
mp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
dec
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
dec
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
tmp
.
t32
);
for
(
n
=
0
;
n
<
len
;
++
n
)
out
[
n
]
^=
iv
[
n
];
out
[
n
]
=
tmp
.
t8
[
n
]
^
iv
[
n
];
iv
=
in
;
}
memcpy
(
ivec
,
iv
,
CAMELLIA_BLOCK_SIZE
);
...
...
@@ -245,36 +241,32 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
{
while
(
len
>=
CAMELLIA_BLOCK_SIZE
)
{
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
t32
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
dec
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
dec
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
tmp
.
t32
);
for
(
n
=
0
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
^=
ivec
[
n
];
memcpy
(
ivec
,
tmp
,
CAMELLIA_BLOCK_SIZE
);
tmp
.
t8
[
n
]
^=
ivec
[
n
];
memcpy
(
ivec
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
out
,
tmp
.
t8
,
CAMELLIA_BLOCK_SIZE
);
len
-=
CAMELLIA_BLOCK_SIZE
;
in
+=
CAMELLIA_BLOCK_SIZE
;
out
+=
CAMELLIA_BLOCK_SIZE
;
}
if
(
len
)
{
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
t32
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
.
t8
,
in
,
CAMELLIA_BLOCK_SIZE
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
key
->
dec
(
key
->
rd_key
,
t32
);
SWAP4WORD
(
t
mp
.
t
32
);
key
->
dec
(
key
->
rd_key
,
t
mp
.
t
32
);
if
(
camellia_endian
.
little
)
SWAP4WORD
(
t32
);
memcpy
(
out
,
t32
,
CAMELLIA_BLOCK_SIZE
);
SWAP4WORD
(
tmp
.
t32
);
for
(
n
=
0
;
n
<
len
;
++
n
)
out
[
n
]
^=
ivec
[
n
];
for
(
n
=
len
;
n
<
CAMELLIA_BLOCK_SIZE
;
++
n
)
out
[
n
]
=
tmp
[
n
];
memcpy
(
ivec
,
tmp
,
CAMELLIA_BLOCK_SIZE
);
tmp
.
t8
[
n
]
^=
ivec
[
n
];
memcpy
(
ivec
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
out
,
tmp
.
t8
,
len
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录