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
dbd02e30
Commit
dbd02e30
authored
Mar 15, 2016
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
twofish: Fix undefined shift.
parent
3f1403b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
ChangeLog
ChangeLog
+6
-0
twofish.c
twofish.c
+8
-7
No files found.
ChangeLog
View file @
dbd02e30
2016-03-15 Niels Möller <nisse@lysator.liu.se>
* twofish.c (gf_multiply): Change return value to uint32_t, to
make shifting of the return value well defined, without any type
casts. Fixes an undefined shift in compute_s, reported by Nikos
Mavrogiannopoulos.
(h_byte): Deleted type casts.
* blowfish.c (blowfish_encrypt, blowfish_decrypt): Use READ_UINT32
macro. Fixes an undefined shift, reported by Nikos
Mavrogiannopoulos.
...
...
twofish.c
View file @
dbd02e30
...
...
@@ -135,9 +135,10 @@ static const uint8_t q1[256] = {
/* ------------------------------------------------------------------------- */
/* uint
8
_t gf_multiply(uint8_t p, uint8_t a, uint8_t b)
/* uint
32
_t gf_multiply(uint8_t p, uint8_t a, uint8_t b)
*
* Multiplication in GF(2^8).
* Multiplication in GF(2^8). Larger return type, to avoid need for
* type casts when the return value is shifted left.
*
* This function multiplies a times b in the Galois Field GF(2^8) with
* primitive polynomial p.
...
...
@@ -149,7 +150,7 @@ static const uint8_t q1[256] = {
* operation.
*/
static
uint
8
_t
static
uint
32
_t
gf_multiply
(
uint8_t
p
,
uint8_t
a
,
uint8_t
b
)
{
uint32_t
shift
=
b
;
...
...
@@ -241,10 +242,10 @@ h_byte(int k, int i, uint8_t x, uint8_t l0, uint8_t l1, uint8_t l2, uint8_t l3)
q_table
[
i
][
2
][
k
==
2
?
x
:
l2
^
q_table
[
i
][
1
][
k
==
3
?
x
:
l3
^
q_table
[
i
][
0
][
x
]]]]];
return
(
(
(
uint32_t
)
gf_multiply
(
0x69
,
mds_matrix
[
0
][
i
],
y
))
|
(
(
uint32_t
)
gf_multiply
(
0x69
,
mds_matrix
[
1
][
i
],
y
)
<<
8
)
|
(
(
uint32_t
)
gf_multiply
(
0x69
,
mds_matrix
[
2
][
i
],
y
)
<<
16
)
|
(
(
uint32_t
)
gf_multiply
(
0x69
,
mds_matrix
[
3
][
i
],
y
)
<<
24
)
);
return
(
(
gf_multiply
(
0x69
,
mds_matrix
[
0
][
i
],
y
))
|
(
gf_multiply
(
0x69
,
mds_matrix
[
1
][
i
],
y
)
<<
8
)
|
(
gf_multiply
(
0x69
,
mds_matrix
[
2
][
i
],
y
)
<<
16
)
|
(
gf_multiply
(
0x69
,
mds_matrix
[
3
][
i
],
y
)
<<
24
)
);
}
/* uint32_t h(int k, uint8_t x, uint32_t l0, uint32_t l1, uint32_t l2, uint32_t l3);
...
...
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