Skip to content

Commit d1bcdc5

Browse files
author
olereinhardt
committed
Tag 64-bit constants with "LL" (make e.g. AVR32 gcc happy)
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@251 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
1 parent a5f7ede commit d1bcdc5

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

crypto/sha384.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
void SHA384_Init(SHA384_CTX *ctx)
3939
{
4040
//Set initial hash value
41-
ctx->h_dig.h[0] = 0xCBBB9D5DC1059ED8;
42-
ctx->h_dig.h[1] = 0x629A292A367CD507;
43-
ctx->h_dig.h[2] = 0x9159015A3070DD17;
44-
ctx->h_dig.h[3] = 0x152FECD8F70E5939;
45-
ctx->h_dig.h[4] = 0x67332667FFC00B31;
46-
ctx->h_dig.h[5] = 0x8EB44A8768581511;
47-
ctx->h_dig.h[6] = 0xDB0C2E0D64F98FA7;
48-
ctx->h_dig.h[7] = 0x47B5481DBEFA4FA4;
41+
ctx->h_dig.h[0] = 0xCBBB9D5DC1059ED8LL;
42+
ctx->h_dig.h[1] = 0x629A292A367CD507LL;
43+
ctx->h_dig.h[2] = 0x9159015A3070DD17LL;
44+
ctx->h_dig.h[3] = 0x152FECD8F70E5939LL;
45+
ctx->h_dig.h[4] = 0x67332667FFC00B31LL;
46+
ctx->h_dig.h[5] = 0x8EB44A8768581511LL;
47+
ctx->h_dig.h[6] = 0xDB0C2E0D64F98FA7LL;
48+
ctx->h_dig.h[7] = 0x47B5481DBEFA4FA4LL;
4949

5050
// Number of bytes in the buffer
5151
ctx->size = 0;

crypto/sha512.c

+28-28
Original file line numberDiff line numberDiff line change
@@ -56,41 +56,41 @@ static const uint8_t padding[128] =
5656

5757
static const uint64_t k[80] =
5858
{
59-
0x428A2F98D728AE22, 0x7137449123EF65CD, 0xB5C0FBCFEC4D3B2F, 0xE9B5DBA58189DBBC,
60-
0x3956C25BF348B538, 0x59F111F1B605D019, 0x923F82A4AF194F9B, 0xAB1C5ED5DA6D8118,
61-
0xD807AA98A3030242, 0x12835B0145706FBE, 0x243185BE4EE4B28C, 0x550C7DC3D5FFB4E2,
62-
0x72BE5D74F27B896F, 0x80DEB1FE3B1696B1, 0x9BDC06A725C71235, 0xC19BF174CF692694,
63-
0xE49B69C19EF14AD2, 0xEFBE4786384F25E3, 0x0FC19DC68B8CD5B5, 0x240CA1CC77AC9C65,
64-
0x2DE92C6F592B0275, 0x4A7484AA6EA6E483, 0x5CB0A9DCBD41FBD4, 0x76F988DA831153B5,
65-
0x983E5152EE66DFAB, 0xA831C66D2DB43210, 0xB00327C898FB213F, 0xBF597FC7BEEF0EE4,
66-
0xC6E00BF33DA88FC2, 0xD5A79147930AA725, 0x06CA6351E003826F, 0x142929670A0E6E70,
67-
0x27B70A8546D22FFC, 0x2E1B21385C26C926, 0x4D2C6DFC5AC42AED, 0x53380D139D95B3DF,
68-
0x650A73548BAF63DE, 0x766A0ABB3C77B2A8, 0x81C2C92E47EDAEE6, 0x92722C851482353B,
69-
0xA2BFE8A14CF10364, 0xA81A664BBC423001, 0xC24B8B70D0F89791, 0xC76C51A30654BE30,
70-
0xD192E819D6EF5218, 0xD69906245565A910, 0xF40E35855771202A, 0x106AA07032BBD1B8,
71-
0x19A4C116B8D2D0C8, 0x1E376C085141AB53, 0x2748774CDF8EEB99, 0x34B0BCB5E19B48A8,
72-
0x391C0CB3C5C95A63, 0x4ED8AA4AE3418ACB, 0x5B9CCA4F7763E373, 0x682E6FF3D6B2B8A3,
73-
0x748F82EE5DEFB2FC, 0x78A5636F43172F60, 0x84C87814A1F0AB72, 0x8CC702081A6439EC,
74-
0x90BEFFFA23631E28, 0xA4506CEBDE82BDE9, 0xBEF9A3F7B2C67915, 0xC67178F2E372532B,
75-
0xCA273ECEEA26619C, 0xD186B8C721C0C207, 0xEADA7DD6CDE0EB1E, 0xF57D4F7FEE6ED178,
76-
0x06F067AA72176FBA, 0x0A637DC5A2C898A6, 0x113F9804BEF90DAE, 0x1B710B35131C471B,
77-
0x28DB77F523047D84, 0x32CAAB7B40C72493, 0x3C9EBE0A15C9BEBC, 0x431D67C49C100D4C,
78-
0x4CC5D4BECB3E42B6, 0x597F299CFC657E2A, 0x5FCB6FAB3AD6FAEC, 0x6C44198C4A475817
59+
0x428A2F98D728AE22LL, 0x7137449123EF65CDLL, 0xB5C0FBCFEC4D3B2FLL, 0xE9B5DBA58189DBBCLL,
60+
0x3956C25BF348B538LL, 0x59F111F1B605D019LL, 0x923F82A4AF194F9BLL, 0xAB1C5ED5DA6D8118LL,
61+
0xD807AA98A3030242LL, 0x12835B0145706FBELL, 0x243185BE4EE4B28CLL, 0x550C7DC3D5FFB4E2LL,
62+
0x72BE5D74F27B896FLL, 0x80DEB1FE3B1696B1LL, 0x9BDC06A725C71235LL, 0xC19BF174CF692694LL,
63+
0xE49B69C19EF14AD2LL, 0xEFBE4786384F25E3LL, 0x0FC19DC68B8CD5B5LL, 0x240CA1CC77AC9C65LL,
64+
0x2DE92C6F592B0275LL, 0x4A7484AA6EA6E483LL, 0x5CB0A9DCBD41FBD4LL, 0x76F988DA831153B5LL,
65+
0x983E5152EE66DFABLL, 0xA831C66D2DB43210LL, 0xB00327C898FB213FLL, 0xBF597FC7BEEF0EE4LL,
66+
0xC6E00BF33DA88FC2LL, 0xD5A79147930AA725LL, 0x06CA6351E003826FLL, 0x142929670A0E6E70LL,
67+
0x27B70A8546D22FFCLL, 0x2E1B21385C26C926LL, 0x4D2C6DFC5AC42AEDLL, 0x53380D139D95B3DFLL,
68+
0x650A73548BAF63DELL, 0x766A0ABB3C77B2A8LL, 0x81C2C92E47EDAEE6LL, 0x92722C851482353BLL,
69+
0xA2BFE8A14CF10364LL, 0xA81A664BBC423001LL, 0xC24B8B70D0F89791LL, 0xC76C51A30654BE30LL,
70+
0xD192E819D6EF5218LL, 0xD69906245565A910LL, 0xF40E35855771202ALL, 0x106AA07032BBD1B8LL,
71+
0x19A4C116B8D2D0C8LL, 0x1E376C085141AB53LL, 0x2748774CDF8EEB99LL, 0x34B0BCB5E19B48A8LL,
72+
0x391C0CB3C5C95A63LL, 0x4ED8AA4AE3418ACBLL, 0x5B9CCA4F7763E373LL, 0x682E6FF3D6B2B8A3LL,
73+
0x748F82EE5DEFB2FCLL, 0x78A5636F43172F60LL, 0x84C87814A1F0AB72LL, 0x8CC702081A6439ECLL,
74+
0x90BEFFFA23631E28LL, 0xA4506CEBDE82BDE9LL, 0xBEF9A3F7B2C67915LL, 0xC67178F2E372532BLL,
75+
0xCA273ECEEA26619CLL, 0xD186B8C721C0C207LL, 0xEADA7DD6CDE0EB1ELL, 0xF57D4F7FEE6ED178LL,
76+
0x06F067AA72176FBALL, 0x0A637DC5A2C898A6LL, 0x113F9804BEF90DAELL, 0x1B710B35131C471BLL,
77+
0x28DB77F523047D84LL, 0x32CAAB7B40C72493LL, 0x3C9EBE0A15C9BEBCLL, 0x431D67C49C100D4CLL,
78+
0x4CC5D4BECB3E42B6LL, 0x597F299CFC657E2ALL, 0x5FCB6FAB3AD6FAECLL, 0x6C44198C4A475817LL
7979
};
8080

8181
/**
8282
* Initialize the SHA512 context
8383
*/
8484
void SHA512_Init(SHA512_CTX *ctx)
8585
{
86-
ctx->h_dig.h[0] = 0x6A09E667F3BCC908;
87-
ctx->h_dig.h[1] = 0xBB67AE8584CAA73B;
88-
ctx->h_dig.h[2] = 0x3C6EF372FE94F82B;
89-
ctx->h_dig.h[3] = 0xA54FF53A5F1D36F1;
90-
ctx->h_dig.h[4] = 0x510E527FADE682D1;
91-
ctx->h_dig.h[5] = 0x9B05688C2B3E6C1F;
92-
ctx->h_dig.h[6] = 0x1F83D9ABFB41BD6B;
93-
ctx->h_dig.h[7] = 0x5BE0CD19137E2179;
86+
ctx->h_dig.h[0] = 0x6A09E667F3BCC908LL;
87+
ctx->h_dig.h[1] = 0xBB67AE8584CAA73BLL;
88+
ctx->h_dig.h[2] = 0x3C6EF372FE94F82BLL;
89+
ctx->h_dig.h[3] = 0xA54FF53A5F1D36F1LL;
90+
ctx->h_dig.h[4] = 0x510E527FADE682D1LL;
91+
ctx->h_dig.h[5] = 0x9B05688C2B3E6C1FLL;
92+
ctx->h_dig.h[6] = 0x1F83D9ABFB41BD6BLL;
93+
ctx->h_dig.h[7] = 0x5BE0CD19137E2179LL;
9494
ctx->size = 0;
9595
ctx->totalSize = 0;
9696
}

0 commit comments

Comments
 (0)