Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
ed59fe97
Commit
ed59fe97
authored
Oct 10, 2000
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* src/symmetric/serpent.c (serpent_setup): Reworked key padding.
Rev: src/symmetric/serpent.c:1.4
parent
ad08f5e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
7 deletions
+25
-7
serpent.c
serpent.c
+25
-7
No files found.
serpent.c
View file @
ed59fe97
...
...
@@ -42,19 +42,39 @@
void
serpent_setup
(
SERPENT_context
*
ctx
,
UINT32
key_size
,
const
UINT8
*
key
)
{
UINT32
i
,
j
;
unsigned
i
,
j
;
UINT32
w
[
132
],
k
[
132
];
UINT32
kd
[
8
];
const
UINT8
*
kptr
;
/* UINT32 kd[8]; */
/* const UINT8 *kptr; */
assert
(
key_size
>=
SERPENT_MIN_KEYSIZE
);
assert
(
key_size
<=
SERPENT_MAX_KEYSIZE
);
for
(
i
=
key_size
,
j
=
0
;
(
i
>=
4
);
i
-=
4
,
key
+=
4
,
j
++
)
{
assert
(
j
<
8
);
w
[
j
]
=
key
[
0
]
|
(
key
[
1
]
<<
8
)
|
(
key
[
2
]
<<
16
)
|
(
key
[
3
]
<<
24
);
}
if
(
j
<
8
)
{
/* Pad key, "aabbcc" -> "aabbcc0100...00" */
UINT32
partial
=
0x01
;
while
(
i
)
partial
=
(
partial
<<
8
)
|
key
[
--
i
];
w
[
j
++
]
=
partial
;
while
(
j
<
8
)
w
[
j
++
]
=
0
;
}
#if 0
if (key_size == SERPENT_KEYSIZE)
kptr = key;
else
{
/* Expand key by appending bits 1000...0. */
/* Expand key by appending bits 1000...0
0
. */
UINT8 *ekey = alloca(SERPENT_KEYSIZE);
unsigned i = key_size;
...
...
@@ -76,7 +96,6 @@ serpent_setup(SERPENT_context *ctx, UINT32 key_size, const UINT8 *key)
for(i=0; i<8; i++)
w[i]=kd[i];
#if 0
for(i++; i<8; i++)
w[i]=0;
#endif
...
...
@@ -122,10 +141,9 @@ serpent_setup(SERPENT_context *ctx, UINT32 key_size, const UINT8 *key)
RND04
(
w
[
124
],
w
[
125
],
w
[
126
],
w
[
127
],
k
[
124
],
k
[
125
],
k
[
126
],
k
[
127
]);
RND03
(
w
[
128
],
w
[
129
],
w
[
130
],
w
[
131
],
k
[
128
],
k
[
129
],
k
[
130
],
k
[
131
]);
for
(
i
=
0
;
i
<=
32
;
i
++
)
{
for
(
i
=
0
;
i
<=
32
;
i
++
)
for
(
j
=
0
;
j
<
4
;
j
++
)
ctx
->
keys
[
i
][
j
]
=
k
[
4
*
i
+
j
];
}
}
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment