1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00

* sha512.c: Suffix all 64-bit constants with LL. Note this makes this

file non-c89 compliant.  That is okay since we have an autoconf check for
this, and many c89 compilers support LL anyway.
This commit is contained in:
David Shaw 2003-05-09 15:17:28 +00:00
parent fce597623b
commit 74a0287acf
2 changed files with 56 additions and 50 deletions

View File

@ -1,3 +1,9 @@
2003-05-09 David Shaw <dshaw@jabberwocky.com>
* sha512.c: Suffix all 64-bit constants with LL. Note this makes
this file non-c89 compliant. That is okay since we have an
autoconf check for this, and many c89 compilers support LL anyway.
2003-05-08 David Shaw <dshaw@jabberwocky.com>
* cipher.c (fast_random_poll): Only use times() if we HAVE_TIMES.

View File

@ -77,14 +77,14 @@ burn_stack (int bytes)
void
sha512_init( SHA512_CONTEXT *hd )
{
hd->h0 = 0x6a09e667f3bcc908;
hd->h1 = 0xbb67ae8584caa73b;
hd->h2 = 0x3c6ef372fe94f82b;
hd->h3 = 0xa54ff53a5f1d36f1;
hd->h4 = 0x510e527fade682d1;
hd->h5 = 0x9b05688c2b3e6c1f;
hd->h6 = 0x1f83d9abfb41bd6b;
hd->h7 = 0x5be0cd19137e2179;
hd->h0 = 0x6a09e667f3bcc908LL;
hd->h1 = 0xbb67ae8584caa73bLL;
hd->h2 = 0x3c6ef372fe94f82bLL;
hd->h3 = 0xa54ff53a5f1d36f1LL;
hd->h4 = 0x510e527fade682d1LL;
hd->h5 = 0x9b05688c2b3e6c1fLL;
hd->h6 = 0x1f83d9abfb41bd6bLL;
hd->h7 = 0x5be0cd19137e2179LL;
hd->nblocks = 0;
hd->count = 0;
@ -93,14 +93,14 @@ sha512_init( SHA512_CONTEXT *hd )
void
sha384_init( SHA512_CONTEXT *hd )
{
hd->h0 = 0xcbbb9d5dc1059ed8;
hd->h1 = 0x629a292a367cd507;
hd->h2 = 0x9159015a3070dd17;
hd->h3 = 0x152fecd8f70e5939;
hd->h4 = 0x67332667ffc00b31;
hd->h5 = 0x8eb44a8768581511;
hd->h6 = 0xdb0c2e0d64f98fa7;
hd->h7 = 0x47b5481dbefa4fa4;
hd->h0 = 0xcbbb9d5dc1059ed8LL;
hd->h1 = 0x629a292a367cd507LL;
hd->h2 = 0x9159015a3070dd17LL;
hd->h3 = 0x152fecd8f70e5939LL;
hd->h4 = 0x67332667ffc00b31LL;
hd->h5 = 0x8eb44a8768581511LL;
hd->h6 = 0xdb0c2e0d64f98fa7LL;
hd->h7 = 0x47b5481dbefa4fa4LL;
hd->nblocks = 0;
hd->count = 0;
@ -118,33 +118,33 @@ transform( SHA512_CONTEXT *hd, byte *data )
int t;
static const u64 k[]=
{
0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f,
0xe9b5dba58189dbbc, 0x3956c25bf348b538, 0x59f111f1b605d019,
0x923f82a4af194f9b, 0xab1c5ed5da6d8118, 0xd807aa98a3030242,
0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235,
0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, 0x2de92c6f592b0275,
0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f,
0xbf597fc7beef0ee4, 0xc6e00bf33da88fc2, 0xd5a79147930aa725,
0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc,
0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6,
0x92722c851482353b, 0xa2bfe8a14cf10364, 0xa81a664bbc423001,
0xc24b8b70d0f89791, 0xc76c51a30654be30, 0xd192e819d6ef5218,
0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99,
0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb,
0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc,
0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec,
0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915,
0xc67178f2e372532b, 0xca273eceea26619c, 0xd186b8c721c0c207,
0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x06f067aa72176fba,
0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b,
0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
0x5fcb6fab3ad6faec, 0x6c44198c4a475817
0x428a2f98d728ae22LL, 0x7137449123ef65cdLL, 0xb5c0fbcfec4d3b2fLL,
0xe9b5dba58189dbbcLL, 0x3956c25bf348b538LL, 0x59f111f1b605d019LL,
0x923f82a4af194f9bLL, 0xab1c5ed5da6d8118LL, 0xd807aa98a3030242LL,
0x12835b0145706fbeLL, 0x243185be4ee4b28cLL, 0x550c7dc3d5ffb4e2LL,
0x72be5d74f27b896fLL, 0x80deb1fe3b1696b1LL, 0x9bdc06a725c71235LL,
0xc19bf174cf692694LL, 0xe49b69c19ef14ad2LL, 0xefbe4786384f25e3LL,
0x0fc19dc68b8cd5b5LL, 0x240ca1cc77ac9c65LL, 0x2de92c6f592b0275LL,
0x4a7484aa6ea6e483LL, 0x5cb0a9dcbd41fbd4LL, 0x76f988da831153b5LL,
0x983e5152ee66dfabLL, 0xa831c66d2db43210LL, 0xb00327c898fb213fLL,
0xbf597fc7beef0ee4LL, 0xc6e00bf33da88fc2LL, 0xd5a79147930aa725LL,
0x06ca6351e003826fLL, 0x142929670a0e6e70LL, 0x27b70a8546d22ffcLL,
0x2e1b21385c26c926LL, 0x4d2c6dfc5ac42aedLL, 0x53380d139d95b3dfLL,
0x650a73548baf63deLL, 0x766a0abb3c77b2a8LL, 0x81c2c92e47edaee6LL,
0x92722c851482353bLL, 0xa2bfe8a14cf10364LL, 0xa81a664bbc423001LL,
0xc24b8b70d0f89791LL, 0xc76c51a30654be30LL, 0xd192e819d6ef5218LL,
0xd69906245565a910LL, 0xf40e35855771202aLL, 0x106aa07032bbd1b8LL,
0x19a4c116b8d2d0c8LL, 0x1e376c085141ab53LL, 0x2748774cdf8eeb99LL,
0x34b0bcb5e19b48a8LL, 0x391c0cb3c5c95a63LL, 0x4ed8aa4ae3418acbLL,
0x5b9cca4f7763e373LL, 0x682e6ff3d6b2b8a3LL, 0x748f82ee5defb2fcLL,
0x78a5636f43172f60LL, 0x84c87814a1f0ab72LL, 0x8cc702081a6439ecLL,
0x90befffa23631e28LL, 0xa4506cebde82bde9LL, 0xbef9a3f7b2c67915LL,
0xc67178f2e372532bLL, 0xca273eceea26619cLL, 0xd186b8c721c0c207LL,
0xeada7dd6cde0eb1eLL, 0xf57d4f7fee6ed178LL, 0x06f067aa72176fbaLL,
0x0a637dc5a2c898a6LL, 0x113f9804bef90daeLL, 0x1b710b35131c471bLL,
0x28db77f523047d84LL, 0x32caab7b40c72493LL, 0x3c9ebe0a15c9bebcLL,
0x431d67c49c100d4cLL, 0x4cc5d4becb3e42b6LL, 0x597f299cfc657e2aLL,
0x5fcb6fab3ad6faecLL, 0x6c44198c4a475817LL
};
/* get values from the chaining vars */