diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2006-04-20 04:24:48 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2006-04-20 04:24:48 +0000 |
| commit | e79dd1356bec312af8aee6093dfddea0c978ebbd (patch) | |
| tree | c90d63ccb09adc7db5f6d46ea7bef1b952f66956 /src/lib/crypto/sha1 | |
| parent | d29518ffa3a2100c7c7296ac1afdc7b1202035f1 (diff) | |
| download | krb5-e79dd1356bec312af8aee6093dfddea0c978ebbd.tar.gz krb5-e79dd1356bec312af8aee6093dfddea0c978ebbd.tar.xz krb5-e79dd1356bec312af8aee6093dfddea0c978ebbd.zip | |
shsUpdate should take an unsigned int for length
Update shsUpdate to take an unsigned int length instead of signed.
The code already assumes that it is an integer >= 0. This change
cleans up a number of signed/unsigned warnings.
sha1/shs.h, shs.c, t_shs.c: change ints to unsigned int
dk/dk_encrypt.c: static function trunc_hmac change a signed int to unsigned
hash_provider/hash_sha1.c: Remove cast in argument to shsUpdate
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17945 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/sha1')
| -rw-r--r-- | src/lib/crypto/sha1/shs.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/sha1/shs.h | 2 | ||||
| -rw-r--r-- | src/lib/crypto/sha1/t_shs3.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/crypto/sha1/shs.c b/src/lib/crypto/sha1/shs.c index 0d7daa606..a027fd76d 100644 --- a/src/lib/crypto/sha1/shs.c +++ b/src/lib/crypto/sha1/shs.c @@ -240,7 +240,7 @@ void SHSTransform(SHS_LONG *digest, const SHS_LONG *data) /* Update SHS for a block of data */ -void shsUpdate(SHS_INFO *shsInfo, const SHS_BYTE *buffer, int count) +void shsUpdate(SHS_INFO *shsInfo, const SHS_BYTE *buffer, unsigned int count) { SHS_LONG tmp; int dataCount, canfill; diff --git a/src/lib/crypto/sha1/shs.h b/src/lib/crypto/sha1/shs.h index 96422c468..6dcb41b40 100644 --- a/src/lib/crypto/sha1/shs.h +++ b/src/lib/crypto/sha1/shs.h @@ -27,7 +27,7 @@ typedef struct { /* Message digest functions (shs.c) */ void shsInit(SHS_INFO *shsInfo); -void shsUpdate(SHS_INFO *shsInfo, const SHS_BYTE *buffer, int count); +void shsUpdate(SHS_INFO *shsInfo, const SHS_BYTE *buffer, unsigned int count); void shsFinal(SHS_INFO *shsInfo); diff --git a/src/lib/crypto/sha1/t_shs3.c b/src/lib/crypto/sha1/t_shs3.c index cefec45eb..96b36a76e 100644 --- a/src/lib/crypto/sha1/t_shs3.c +++ b/src/lib/crypto/sha1/t_shs3.c @@ -357,7 +357,7 @@ static void test6(void) } sdata; unsigned char digest[SHS_DIGESTSIZE]; int failed; - int i, j; + unsigned int i, j; printf("Running SHS test 6 ...\n"); sdata.pad1 = 0x12345678; @@ -470,12 +470,12 @@ unsigned char results7[SHS_DIGESTSIZE] = { 0x89,0x41,0x65,0xce,0x76,0xc1,0xd1,0xd1,0xc3,0x6f, 0xab,0x92,0x79,0x30,0x01,0x71,0x63,0x1f,0x74,0xfe}; -int jfsize[] = {0,1,31,32, +unsigned int jfsize[] = {0,1,31,32, 33,55,56,63, 64,65,71,72, 73,95,96,97, 119,120,123,127}; -int kfsize[] = {0,1,31,32,33,55,56,63}; +unsigned int kfsize[] = {0,1,31,32,33,55,56,63}; static void test7(void) { @@ -488,7 +488,7 @@ static void test7(void) } sdata; unsigned char digest[SHS_DIGESTSIZE]; int failed; - int i, j, k, l; + unsigned int i, j, k, l; printf("Running SHS test 7 ...\n"); sdata.pad1 = 0x12345678; |