Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
9f8cfb1c
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,发现更多精彩内容 >>
提交
9f8cfb1c
编写于
12月 02, 2006
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve Camellia code readability.
上级
c163b5f7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
10 deletion
+4
-10
crypto/camellia/cmll_cbc.c
crypto/camellia/cmll_cbc.c
+2
-5
crypto/camellia/cmll_locl.h
crypto/camellia/cmll_locl.h
+0
-3
crypto/camellia/cmll_misc.c
crypto/camellia/cmll_misc.c
+2
-2
未找到文件。
crypto/camellia/cmll_cbc.c
浏览文件 @
9f8cfb1c
...
@@ -69,16 +69,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
...
@@ -69,16 +69,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
unsigned
long
len
=
length
;
unsigned
long
len
=
length
;
unsigned
char
tmp
[
CAMELLIA_BLOCK_SIZE
];
unsigned
char
tmp
[
CAMELLIA_BLOCK_SIZE
];
const
unsigned
char
*
iv
=
ivec
;
const
unsigned
char
*
iv
=
ivec
;
u32
t32
[
UNITSIZE
];
u32
t32
[
CAMELLIA_BLOCK_SIZE
/
sizeof
(
u32
)
];
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
assert
(
in
&&
out
&&
key
&&
ivec
);
assert
(
in
&&
out
&&
key
&&
ivec
);
assert
((
CAMELLIA_ENCRYPT
==
enc
)
||
(
CAMELLIA_DECRYPT
==
enc
));
assert
((
CAMELLIA_ENCRYPT
==
enc
)
||
(
CAMELLIA_DECRYPT
==
enc
));
if
(((
size_t
)
in
)
%
ALIGN
==
0
if
(((
size_t
)
in
|
(
size_t
)
out
|
(
size_t
)
ivec
)
%
sizeof
(
u32
)
==
0
)
&&
((
size_t
)
out
)
%
ALIGN
==
0
&&
((
size_t
)
ivec
)
%
ALIGN
==
0
)
{
{
if
(
CAMELLIA_ENCRYPT
==
enc
)
if
(
CAMELLIA_ENCRYPT
==
enc
)
{
{
...
@@ -281,4 +279,3 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
...
@@ -281,4 +279,3 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
}
}
}
}
}
}
crypto/camellia/cmll_locl.h
浏览文件 @
9f8cfb1c
...
@@ -80,9 +80,6 @@ typedef unsigned int u32;
...
@@ -80,9 +80,6 @@ typedef unsigned int u32;
extern
"C"
{
extern
"C"
{
#endif
#endif
#define ALIGN 4
#define UNITSIZE 4
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
# define SWAP(x) ( _lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00 )
# define SWAP(x) ( _lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00 )
# define GETU32(p) SWAP(*((u32 *)(p)))
# define GETU32(p) SWAP(*((u32 *)(p)))
...
...
crypto/camellia/cmll_misc.c
浏览文件 @
9f8cfb1c
...
@@ -91,7 +91,7 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
...
@@ -91,7 +91,7 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
void
Camellia_encrypt
(
const
unsigned
char
*
in
,
unsigned
char
*
out
,
void
Camellia_encrypt
(
const
unsigned
char
*
in
,
unsigned
char
*
out
,
const
CAMELLIA_KEY
*
key
)
const
CAMELLIA_KEY
*
key
)
{
{
u32
tmp
[
UNITSIZE
];
u32
tmp
[
CAMELLIA_BLOCK_SIZE
/
sizeof
(
u32
)
];
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
...
@@ -104,7 +104,7 @@ void Camellia_encrypt(const unsigned char *in, unsigned char *out,
...
@@ -104,7 +104,7 @@ void Camellia_encrypt(const unsigned char *in, unsigned char *out,
void
Camellia_decrypt
(
const
unsigned
char
*
in
,
unsigned
char
*
out
,
void
Camellia_decrypt
(
const
unsigned
char
*
in
,
unsigned
char
*
out
,
const
CAMELLIA_KEY
*
key
)
const
CAMELLIA_KEY
*
key
)
{
{
u32
tmp
[
UNITSIZE
];
u32
tmp
[
CAMELLIA_BLOCK_SIZE
/
sizeof
(
u32
)
];
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
const
union
{
long
one
;
char
little
;
}
camellia_endian
=
{
1
};
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
memcpy
(
tmp
,
in
,
CAMELLIA_BLOCK_SIZE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录