diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-06-18 14:09:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-06-18 14:09:55 +0000 |
commit | 200aaa0dd6813f19eb7ed67a0fdc301d091fc2d7 (patch) | |
tree | f89388586fbf00a3b7c985b2b28bb74abda3a364 /src/util/crypto_hash.c | |
parent | 640ae593fd34d27034f994a2e945a8942f1a4d5d (diff) | |
download | gnunet-200aaa0dd6813f19eb7ed67a0fdc301d091fc2d7.tar.gz gnunet-200aaa0dd6813f19eb7ed67a0fdc301d091fc2d7.zip |
localization
of scopes
Diffstat (limited to 'src/util/crypto_hash.c')
-rw-r--r-- | src/util/crypto_hash.c | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index 73b9c9654..74ea72de4 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c | |||
@@ -63,36 +63,6 @@ RORu64 (unsigned long long x, unsigned long long y) | |||
63 | return (x >> y) | (x << (64 - y)); | 63 | return (x >> y) | (x << (64 - y)); |
64 | } | 64 | } |
65 | 65 | ||
66 | const unsigned long long sha512_K[80] = { | ||
67 | 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, | ||
68 | 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, | ||
69 | 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL, | ||
70 | 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, | ||
71 | 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, | ||
72 | 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, | ||
73 | 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL, | ||
74 | 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, | ||
75 | 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, | ||
76 | 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, | ||
77 | 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL, | ||
78 | 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, | ||
79 | 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, | ||
80 | 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, | ||
81 | 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL, | ||
82 | 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, | ||
83 | 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, | ||
84 | 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, | ||
85 | 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL, | ||
86 | 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, | ||
87 | 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, | ||
88 | 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, | ||
89 | 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL, | ||
90 | 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, | ||
91 | 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, | ||
92 | 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, | ||
93 | 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL, | ||
94 | }; | ||
95 | |||
96 | #define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39)) | 66 | #define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39)) |
97 | #define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41)) | 67 | #define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41)) |
98 | #define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7)) | 68 | #define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7)) |
@@ -143,6 +113,36 @@ const unsigned long long sha512_K[80] = { | |||
143 | static void | 113 | static void |
144 | sha512_transform (unsigned long long *state, const unsigned char *input) | 114 | sha512_transform (unsigned long long *state, const unsigned char *input) |
145 | { | 115 | { |
116 | static const unsigned long long sha512_K[80] = { | ||
117 | 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, | ||
118 | 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, | ||
119 | 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL, | ||
120 | 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, | ||
121 | 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, | ||
122 | 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, | ||
123 | 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL, | ||
124 | 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, | ||
125 | 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, | ||
126 | 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, | ||
127 | 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL, | ||
128 | 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, | ||
129 | 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, | ||
130 | 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, | ||
131 | 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL, | ||
132 | 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, | ||
133 | 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, | ||
134 | 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, | ||
135 | 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL, | ||
136 | 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, | ||
137 | 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, | ||
138 | 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, | ||
139 | 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL, | ||
140 | 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, | ||
141 | 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, | ||
142 | 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, | ||
143 | 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL, | ||
144 | }; | ||
145 | |||
146 | unsigned long long a, b, c, d, e, f, g, h, t1, t2; | 146 | unsigned long long a, b, c, d, e, f, g, h, t1, t2; |
147 | unsigned long long W[80]; | 147 | unsigned long long W[80]; |
148 | unsigned long long t0; | 148 | unsigned long long t0; |
@@ -561,11 +561,6 @@ GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc) | |||
561 | 561 | ||
562 | /* ***************** binary-ASCII encoding *************** */ | 562 | /* ***************** binary-ASCII encoding *************** */ |
563 | 563 | ||
564 | /** | ||
565 | * 32 characters for encoding (GNUNET_CRYPTO_hash => 32 characters) | ||
566 | */ | ||
567 | static char *encTable__ = "0123456789ABCDEFGHIJKLMNOPQRSTUV"; | ||
568 | |||
569 | static unsigned int | 564 | static unsigned int |
570 | getValue__ (unsigned char a) | 565 | getValue__ (unsigned char a) |
571 | { | 566 | { |
@@ -591,6 +586,10 @@ void | |||
591 | GNUNET_CRYPTO_hash_to_enc (const GNUNET_HashCode * block, | 586 | GNUNET_CRYPTO_hash_to_enc (const GNUNET_HashCode * block, |
592 | struct GNUNET_CRYPTO_HashAsciiEncoded *result) | 587 | struct GNUNET_CRYPTO_HashAsciiEncoded *result) |
593 | { | 588 | { |
589 | /** | ||
590 | * 32 characters for encoding (GNUNET_CRYPTO_hash => 32 characters) | ||
591 | */ | ||
592 | static char *encTable__ = "0123456789ABCDEFGHIJKLMNOPQRSTUV"; | ||
594 | unsigned int wpos; | 593 | unsigned int wpos; |
595 | unsigned int rpos; | 594 | unsigned int rpos; |
596 | unsigned int bits; | 595 | unsigned int bits; |