Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
3e2aa268
Commit
3e2aa268
authored
Jul 04, 2011
by
Kostya Shishkov
Committed by
Mans Rullgard
Jul 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
Signed-off-by:
Mans Rullgard
<
mans@mansr.com
>
parent
9e52a406
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
sha.c
libavutil/sha.c
+2
-2
No files found.
libavutil/sha.c
View file @
3e2aa268
...
...
@@ -42,7 +42,7 @@ const int av_sha_size = sizeof(AVSHA);
#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
#define blk0(i) (block[i] =
av_be2ne32(((const uint32_t*)buffer)[i]
))
#define blk0(i) (block[i] =
AV_RB32(buffer + 4 * (i)
))
#define blk(i) (block[i] = rol(block[i-3] ^ block[i-8] ^ block[i-14] ^ block[i-16], 1))
#define R0(v,w,x,y,z,i) z += ((w&(x^y))^y) + blk0(i) + 0x5A827999 + rol(v, 5); w = rol(w, 30);
...
...
@@ -67,7 +67,7 @@ static void sha1_transform(uint32_t state[5], const uint8_t buffer[64])
for
(
i
=
0
;
i
<
80
;
i
++
)
{
int
t
;
if
(
i
<
16
)
t
=
av_be2ne32
(((
uint32_t
*
)
buffer
)[
i
]
);
t
=
AV_RB32
(
buffer
+
4
*
i
);
else
t
=
rol
(
block
[
i
-
3
]
^
block
[
i
-
8
]
^
block
[
i
-
14
]
^
block
[
i
-
16
],
1
);
block
[
i
]
=
t
;
...
...
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