oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hcrypto: Flag 64bit bit constants as long long

Browse Source 
When using 64bit constants for initialisation flag them as LL, so
the compiler doesn't try to cast them down to a long, and throw away
information, on 32 bit platforms.

Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Simon Wilkinson
2010-10-11 12:47:07 -04:00
committed by Love Hornquist Astrand
parent 3d7fc1001a
commit 4dc6b5f259
1 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
lib/hcrypto/sha512.c
View File

@@ -56,26 +56,46 @@
#define H m->counter[7] #define H m->counter[7]
static const uint64_t constant_512[80] = { static const uint64_t constant_512[80] = {
0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc, 0x428a2f98d728ae22LL, 0x7137449123ef65cdLL,
0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118, 0xb5c0fbcfec4d3b2fLL, 0xe9b5dba58189dbbcLL,
0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, 0x3956c25bf348b538LL, 0x59f111f1b605d019LL,
0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694, 0x923f82a4af194f9bLL, 0xab1c5ed5da6d8118LL,
0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, 0xd807aa98a3030242LL, 0x12835b0145706fbeLL,
0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5, 0x243185be4ee4b28cLL, 0x550c7dc3d5ffb4e2LL,
0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4, 0x72be5d74f27b896fLL, 0x80deb1fe3b1696b1LL,
0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70, 0x9bdc06a725c71235LL, 0xc19bf174cf692694LL,
0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df, 0xe49b69c19ef14ad2LL, 0xefbe4786384f25e3LL,
0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b, 0x0fc19dc68b8cd5b5LL, 0x240ca1cc77ac9c65LL,
0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30, 0x2de92c6f592b0275LL, 0x4a7484aa6ea6e483LL,
0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8, 0x5cb0a9dcbd41fbd4LL, 0x76f988da831153b5LL,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, 0x983e5152ee66dfabLL, 0xa831c66d2db43210LL,
0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, 0xb00327c898fb213fLL, 0xbf597fc7beef0ee4LL,
0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec, 0xc6e00bf33da88fc2LL, 0xd5a79147930aa725LL,
0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b, 0x06ca6351e003826fLL, 0x142929670a0e6e70LL,
0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x27b70a8546d22ffcLL, 0x2e1b21385c26c926LL,
0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b, 0x4d2c6dfc5ac42aedLL, 0x53380d139d95b3dfLL,
0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c, 0x650a73548baf63deLL, 0x766a0abb3c77b2a8LL,
0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 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
}; };
void void
@@ -83,14 +103,14 @@ SHA512_Init (SHA512_CTX *m)
{ {
m->sz[0] = 0; m->sz[0] = 0;
m->sz[1] = 0; m->sz[1] = 0;
A = 0x6a09e667f3bcc908; A = 0x6a09e667f3bcc908LL;
B = 0xbb67ae8584caa73b; B = 0xbb67ae8584caa73bLL;
C = 0x3c6ef372fe94f82b; C = 0x3c6ef372fe94f82bLL;
D = 0xa54ff53a5f1d36f1; D = 0xa54ff53a5f1d36f1LL;
E = 0x510e527fade682d1; E = 0x510e527fade682d1LL;
F = 0x9b05688c2b3e6c1f; F = 0x9b05688c2b3e6c1fLL;
G = 0x1f83d9abfb41bd6b; G = 0x1f83d9abfb41bd6bLL;
H = 0x5be0cd19137e2179; H = 0x5be0cd19137e2179LL;
} }
static void static void
@@ -152,10 +172,10 @@ swap_uint64_t (uint64_t t)
uint64_t temp; uint64_t temp;
temp = cshift64(t, 32); temp = cshift64(t, 32);
temp = ((temp & 0xff00ff00ff00ff00) >> 8) | temp = ((temp & 0xff00ff00ff00ff00LL) >> 8) |
((temp & 0x00ff00ff00ff00ff) << 8); ((temp & 0x00ff00ff00ff00ffLL) << 8);
return ((temp & 0xffff0000ffff0000) >> 16) | return ((temp & 0xffff0000ffff0000LL) >> 16) |
((temp & 0x0000ffff0000ffff) << 16); ((temp & 0x0000ffff0000ffffLL) << 16);
} }
#endif #endif
@@ -248,14 +268,14 @@ SHA384_Init(SHA384_CTX *m)
{ {
m->sz[0] = 0; m->sz[0] = 0;
m->sz[1] = 0; m->sz[1] = 0;
A = 0xcbbb9d5dc1059ed8; A = 0xcbbb9d5dc1059ed8LL;
B = 0x629a292a367cd507; B = 0x629a292a367cd507LL;
C = 0x9159015a3070dd17; C = 0x9159015a3070dd17LL;
D = 0x152fecd8f70e5939; D = 0x152fecd8f70e5939LL;
E = 0x67332667ffc00b31; E = 0x67332667ffc00b31LL;
F = 0x8eb44a8768581511; F = 0x8eb44a8768581511LL;
G = 0xdb0c2e0d64f98fa7; G = 0xdb0c2e0d64f98fa7LL;
H = 0x47b5481dbefa4fa4; H = 0x47b5481dbefa4fa4LL;
} }
void void