Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1b25757f
Commit
1b25757f
authored
Apr 27, 2015
by
antirez
Browse files
sha1.c: use standard uint32_t.
parent
1d6eb701
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/sha1.c
View file @
1b25757f
...
@@ -23,7 +23,7 @@ A million repetitions of "a"
...
@@ -23,7 +23,7 @@ A million repetitions of "a"
#include <stdio.h>
#include <stdio.h>
#include <string.h>
#include <string.h>
#include <s
ys/types.h>
/* for u_int*_t */
#include <s
tdint.h>
#include "solarisfixes.h"
#include "solarisfixes.h"
#include "sha1.h"
#include "sha1.h"
#include "config.h"
#include "config.h"
...
@@ -53,12 +53,12 @@ A million repetitions of "a"
...
@@ -53,12 +53,12 @@ A million repetitions of "a"
/* Hash a single 512-bit block. This is the core of the algorithm. */
/* Hash a single 512-bit block. This is the core of the algorithm. */
void
SHA1Transform
(
u
_
int32_t
state
[
5
],
const
unsigned
char
buffer
[
64
])
void
SHA1Transform
(
uint32_t
state
[
5
],
const
unsigned
char
buffer
[
64
])
{
{
u
_
int32_t
a
,
b
,
c
,
d
,
e
;
uint32_t
a
,
b
,
c
,
d
,
e
;
typedef
union
{
typedef
union
{
unsigned
char
c
[
64
];
unsigned
char
c
[
64
];
u
_
int32_t
l
[
16
];
uint32_t
l
[
16
];
}
CHAR64LONG16
;
}
CHAR64LONG16
;
#ifdef SHA1HANDSOFF
#ifdef SHA1HANDSOFF
CHAR64LONG16
block
[
1
];
/* use array to appear as a pointer */
CHAR64LONG16
block
[
1
];
/* use array to appear as a pointer */
...
@@ -128,9 +128,9 @@ void SHA1Init(SHA1_CTX* context)
...
@@ -128,9 +128,9 @@ void SHA1Init(SHA1_CTX* context)
/* Run your data through this. */
/* Run your data through this. */
void
SHA1Update
(
SHA1_CTX
*
context
,
const
unsigned
char
*
data
,
u
_
int32_t
len
)
void
SHA1Update
(
SHA1_CTX
*
context
,
const
unsigned
char
*
data
,
uint32_t
len
)
{
{
u
_
int32_t
i
,
j
;
uint32_t
i
,
j
;
j
=
context
->
count
[
0
];
j
=
context
->
count
[
0
];
if
((
context
->
count
[
0
]
+=
len
<<
3
)
<
j
)
if
((
context
->
count
[
0
]
+=
len
<<
3
)
<
j
)
...
@@ -168,7 +168,7 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
...
@@ -168,7 +168,7 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
for (i = 0; i < 2; i++)
for (i = 0; i < 2; i++)
{
{
u
_
int32_t t = context->count[i];
uint32_t t = context->count[i];
int j;
int j;
for (j = 0; j < 4; t >>= 8, j++)
for (j = 0; j < 4; t >>= 8, j++)
...
...
src/sha1.h
View file @
1b25757f
...
@@ -8,14 +8,14 @@ By Steve Reid <steve@edmweb.com>
...
@@ -8,14 +8,14 @@ By Steve Reid <steve@edmweb.com>
*/
*/
typedef
struct
{
typedef
struct
{
u
_
int32_t
state
[
5
];
uint32_t
state
[
5
];
u
_
int32_t
count
[
2
];
uint32_t
count
[
2
];
unsigned
char
buffer
[
64
];
unsigned
char
buffer
[
64
];
}
SHA1_CTX
;
}
SHA1_CTX
;
void
SHA1Transform
(
u
_
int32_t
state
[
5
],
const
unsigned
char
buffer
[
64
]);
void
SHA1Transform
(
uint32_t
state
[
5
],
const
unsigned
char
buffer
[
64
]);
void
SHA1Init
(
SHA1_CTX
*
context
);
void
SHA1Init
(
SHA1_CTX
*
context
);
void
SHA1Update
(
SHA1_CTX
*
context
,
const
unsigned
char
*
data
,
u
_
int32_t
len
);
void
SHA1Update
(
SHA1_CTX
*
context
,
const
unsigned
char
*
data
,
uint32_t
len
);
void
SHA1Final
(
unsigned
char
digest
[
20
],
SHA1_CTX
*
context
);
void
SHA1Final
(
unsigned
char
digest
[
20
],
SHA1_CTX
*
context
);
#ifdef REDIS_TEST
#ifdef REDIS_TEST
...
...
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