Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
5e2cbd5f
Commit
5e2cbd5f
authored
Mar 31, 2012
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ROTL32 in the sha1 code.
parent
8a56233b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
ChangeLog
ChangeLog
+2
-0
sha1-compress.c
sha1-compress.c
+5
-9
No files found.
ChangeLog
View file @
5e2cbd5f
...
...
@@ -28,6 +28,8 @@
* serpent-encrypt.c: Likewise.
* serpent-set-key.c: Likewise.
* sha1-compress.c (ROTL): Deleted macro, use ROTL32 instead.
2012-03-30 Niels Möller <nisse@lysator.liu.se>
* nettle-internal.c (nettle_salsa20): Cipher struct for
...
...
sha1-compress.c
View file @
5e2cbd5f
...
...
@@ -86,10 +86,6 @@
#define K3 0x8F1BBCDCL
/* Rounds 40-59 */
#define K4 0xCA62C1D6L
/* Rounds 60-79 */
/* 32-bit rotate left - kludged with shifts */
#define ROTL(n,X) ( ( (X) << (n) ) | ( (X) >> ( 32 - (n) ) ) )
/* The initial expanding function. The hash function is defined over an
80-word expanded input array W, where the first 16 are copies of the input
data, and the remaining 64 are defined by
...
...
@@ -105,15 +101,15 @@
for this information */
#define expand(W,i) ( W[ i & 15 ] = \
ROTL( 1, ( W[ i & 15 ] ^ W[ (i - 14) & 15 ] ^ \
W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] ) ) )
ROTL
32
( 1, ( W[ i & 15 ] ^ W[ (i - 14) & 15 ] ^ \
W[ (i - 8) & 15 ] ^ W[ (i - 3) & 15 ] ) ) )
/* The prototype SHA sub-round. The fundamental sub-round is:
a' = e + ROTL( 5, a ) + f( b, c, d ) + k + data;
a' = e + ROTL
32
( 5, a ) + f( b, c, d ) + k + data;
b' = a;
c' = ROTL( 30, b );
c' = ROTL
32
( 30, b );
d' = c;
e' = d;
...
...
@@ -123,7 +119,7 @@
the next 20 values from the W[] array each time */
#define subRound(a, b, c, d, e, f, k, data) \
( e += ROTL( 5, a ) + f( b, c, d ) + k + data, b = ROTL( 30, b ) )
( e += ROTL
32
( 5, a ) + f( b, c, d ) + k + data, b = ROTL
32
( 30, b ) )
/* Perform the SHA transformation. Note that this code, like MD5, seems to
break some optimizing compilers due to the complexity of the expressions
...
...
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