Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c9e5ac33
Commit
c9e5ac33
authored
Nov 04, 2011
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aes: Avoid illegal read and don't generate more key than we use.
parent
88b24369
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
aes.c
libavutil/aes.c
+4
-4
No files found.
libavutil/aes.c
View file @
c9e5ac33
...
...
@@ -222,11 +222,9 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
a
->
rounds
=
rounds
;
memcpy
(
tk
,
key
,
KC
*
4
);
memcpy
(
a
->
round_key
[
0
].
u8
,
key
,
KC
*
4
);
for
(
t
=
0
;
t
<
(
rounds
+
1
)
*
16
;)
{
memcpy
(
a
->
round_key
[
0
].
u8
+
t
,
tk
,
KC
*
4
);
t
+=
KC
*
4
;
for
(
t
=
KC
*
4
;
t
<
(
rounds
+
1
)
*
16
;
t
+=
KC
*
4
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
tk
[
0
][
i
]
^=
sbox
[
tk
[
KC
-
1
][(
i
+
1
)
&
3
]];
tk
[
0
][
0
]
^=
rcon
[
rconpointer
++
];
...
...
@@ -239,6 +237,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
for
(
i
=
0
;
i
<
4
;
i
++
)
tk
[
j
][
i
]
^=
sbox
[
tk
[
j
-
1
][
i
]];
}
memcpy
(
a
->
round_key
[
0
].
u8
+
t
,
tk
,
KC
*
4
);
}
if
(
decrypt
)
{
...
...
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