nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00
Code Issues Projects Releases Wiki Activity

Adopt C99 <stdint.h> integer types.

Browse Source 
The annoying int64.h is completely retired, since C99 guarantees a
64-bit integer type that you can actually treat like an ordinary
integer. Also, I've replaced the local typedefs uint32 and word32
(scattered through different parts of the crypto code) with the
standard uint32_t.
This commit is contained in:
Simon Tatham
2018-10-26 23:08:58 +01:00
parent 5cb56389bd
commit a647f2ba11
29 changed files with 432 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sshrand.c
View File

@ -70,8 +70,8 @@ int random_diagnostics = 0;
static void random_stir(void)
{
word32 block[HASHINPUT / sizeof(word32)];
word32 digest[HASHSIZE / sizeof(word32)];
uint32_t block[HASHINPUT / sizeof(uint32_t)];
uint32_t digest[HASHSIZE / sizeof(uint32_t)];
int i, j, k;
/*
@ -91,24 +91,24 @@ static void random_stir(void)
for (p = 0; p < POOLSIZE; p += HASHSIZE) {
printf(" ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.pool + p + q));
printf(" %08x", *(uint32_t *)(pool.pool + p + q));
}
printf("\n");
}
printf("incoming:\n ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.incoming + q));
printf(" %08x", *(uint32_t *)(pool.incoming + q));
}
printf("\nincomingb:\n ");
for (q = 0; q < HASHINPUT; q += 4) {
printf(" %08x", *(word32 *)(pool.incomingb + q));
printf(" %08x", *(uint32_t *)(pool.incomingb + q));
}
printf("\n");
random_diagnostics++;
}
#endif
SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb);
SHATransform((uint32_t *) pool.incoming, (uint32_t *) pool.incomingb);
pool.incomingpos = 0;
/*
@ -144,7 +144,7 @@ static void random_stir(void)
*/
for (k = 0; k < sizeof(digest) / sizeof(*digest); k++)
digest[k] ^= ((word32 *) (pool.pool + j))[k];
digest[k] ^= ((uint32_t *) (pool.pool + j))[k];
/*
* Munge our unrevealed first block of the pool into
@ -157,7 +157,7 @@ static void random_stir(void)
*/
for (k = 0; k < sizeof(digest) / sizeof(*digest); k++)
((word32 *) (pool.pool + j))[k] = digest[k];
((uint32_t *) (pool.pool + j))[k] = digest[k];
}
#ifdef RANDOM_DIAGNOSTICS
@ -167,17 +167,17 @@ static void random_stir(void)
for (p = 0; p < POOLSIZE; p += HASHSIZE) {
printf(" ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.pool + p + q));
printf(" %08x", *(uint32_t *)(pool.pool + p + q));
}
printf("\n");
}
printf("incoming:\n ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.incoming + q));
printf(" %08x", *(uint32_t *)(pool.incoming + q));
}
printf("\nincomingb:\n ");
for (q = 0; q < HASHINPUT; q += 4) {
printf(" %08x", *(word32 *)(pool.incomingb + q));
printf(" %08x", *(uint32_t *)(pool.incomingb + q));
}
printf("\n");
}
@ -202,17 +202,17 @@ static void random_stir(void)
for (p = 0; p < POOLSIZE; p += HASHSIZE) {
printf(" ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.pool + p + q));
printf(" %08x", *(uint32_t *)(pool.pool + p + q));
}
printf("\n");
}
printf("incoming:\n ");
for (q = 0; q < HASHSIZE; q += 4) {
printf(" %08x", *(word32 *)(pool.incoming + q));
printf(" %08x", *(uint32_t *)(pool.incoming + q));
}
printf("\nincomingb:\n ");
for (q = 0; q < HASHINPUT; q += 4) {
printf(" %08x", *(word32 *)(pool.incomingb + q));
printf(" %08x", *(uint32_t *)(pool.incomingb + q));
}
printf("\n");
random_diagnostics--;
@ -238,7 +238,7 @@ void random_add_noise(void *noise, int length)
HASHINPUT - pool.incomingpos);
p += HASHINPUT - pool.incomingpos;
length -= HASHINPUT - pool.incomingpos;
SHATransform((word32 *) pool.incoming, (word32 *) pool.incomingb);
SHATransform((uint32_t *) pool.incoming, (uint32_t *) pool.incomingb);
for (i = 0; i < HASHSIZE; i++) {
pool.pool[pool.poolpos++] ^= pool.incoming[i];
if (pool.poolpos >= POOLSIZE)