win32

diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index 012e8a97ce3ad8ca927abe3608e8153f0071bcad..7cf8e7d645866af09d755c6e2b1c687fa01018b0 100644 (file)
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha2.c,v 1.2.2.7 2006/02/24 00:06:32 marka Exp $ */
+/* $Id: sha2.c,v 1.2.2.8 2006/03/10 03:11:45 marka Exp $ */
 
 /*     $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $    */
 /*     $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $    */
@@ -245,6 +245,142 @@ static const isc_uint32_t sha256_initial_hash_value[8] = {
        0x5be0cd19UL
 };
 
+#ifdef WIN32
+/* Hash constant words K for SHA-384 and SHA-512: */
+static const isc_uint64_t K512[80] = {
+       0x428a2f98d728ae22UL, 0x7137449123ef65cdUL,
+       0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL,
+       0x3956c25bf348b538UL, 0x59f111f1b605d019UL,
+       0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL,
+       0xd807aa98a3030242UL, 0x12835b0145706fbeUL,
+       0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL,
+       0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL,
+       0x9bdc06a725c71235UL, 0xc19bf174cf692694UL,
+       0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL,
+       0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL,
+       0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL,
+       0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL,
+       0x983e5152ee66dfabUL, 0xa831c66d2db43210UL,
+       0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL,
+       0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL,
+       0x06ca6351e003826fUL, 0x142929670a0e6e70UL,
+       0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL,
+       0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL,
+       0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL,
+       0x81c2c92e47edaee6UL, 0x92722c851482353bUL,
+       0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL,
+       0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL,
+       0xd192e819d6ef5218UL, 0xd69906245565a910UL,
+       0xf40e35855771202aUL, 0x106aa07032bbd1b8UL,
+       0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL,
+       0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL,
+       0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL,
+       0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL,
+       0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL,
+       0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL,
+       0x90befffa23631e28UL, 0xa4506cebde82bde9UL,
+       0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL,
+       0xca273eceea26619cUL, 0xd186b8c721c0c207UL,
+       0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL,
+       0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL,
+       0x113f9804bef90daeUL, 0x1b710b35131c471bUL,
+       0x28db77f523047d84UL, 0x32caab7b40c72493UL,
+       0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL,
+       0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL,
+       0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL
+};
+
+/* Initial hash value H for SHA-384: */
+static const isc_uint64_t sha384_initial_hash_value[8] = {
+       0xcbbb9d5dc1059ed8UL,
+       0x629a292a367cd507UL,
+       0x9159015a3070dd17UL,
+       0x152fecd8f70e5939UL,
+       0x67332667ffc00b31UL,
+       0x8eb44a8768581511UL,
+       0xdb0c2e0d64f98fa7UL,
+       0x47b5481dbefa4fa4UL
+};
+
+/* Initial hash value H for SHA-512: */
+static const isc_uint64_t sha512_initial_hash_value[8] = {
+       0x6a09e667f3bcc908U,
+       0xbb67ae8584caa73bUL,
+       0x3c6ef372fe94f82bUL,
+       0xa54ff53a5f1d36f1UL,
+       0x510e527fade682d1UL,
+       0x9b05688c2b3e6c1fUL,
+       0x1f83d9abfb41bd6bUL,
+       0x5be0cd19137e2179UL
+};
+/* Hash constant words K for SHA-384 and SHA-512: */
+static const isc_uint64_t K512[80] = {
+       0x428a2f98d728ae22UL, 0x7137449123ef65cdUL,
+       0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL,
+       0x3956c25bf348b538UL, 0x59f111f1b605d019UL,
+       0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL,
+       0xd807aa98a3030242UL, 0x12835b0145706fbeUL,
+       0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL,
+       0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL,
+       0x9bdc06a725c71235UL, 0xc19bf174cf692694UL,
+       0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL,
+       0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL,
+       0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL,
+       0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL,
+       0x983e5152ee66dfabUL, 0xa831c66d2db43210UL,
+       0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL,
+       0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL,
+       0x06ca6351e003826fUL, 0x142929670a0e6e70UL,
+       0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL,
+       0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL,
+       0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL,
+       0x81c2c92e47edaee6UL, 0x92722c851482353bUL,
+       0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL,
+       0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL,
+       0xd192e819d6ef5218UL, 0xd69906245565a910UL,
+       0xf40e35855771202aUL, 0x106aa07032bbd1b8UL,
+       0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL,
+       0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL,
+       0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL,
+       0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL,
+       0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL,
+       0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL,
+       0x90befffa23631e28UL, 0xa4506cebde82bde9UL,
+       0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL,
+       0xca273eceea26619cUL, 0xd186b8c721c0c207UL,
+       0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL,
+       0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL,
+       0x113f9804bef90daeUL, 0x1b710b35131c471bUL,
+       0x28db77f523047d84UL, 0x32caab7b40c72493UL,
+       0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL,
+       0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL,
+       0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL
+};
+
+/* Initial hash value H for SHA-384: */
+static const isc_uint64_t sha384_initial_hash_value[8] = {
+       0xcbbb9d5dc1059ed8UL,
+       0x629a292a367cd507UL,
+       0x9159015a3070dd17UL,
+       0x152fecd8f70e5939UL,
+       0x67332667ffc00b31UL,
+       0x8eb44a8768581511UL,
+       0xdb0c2e0d64f98fa7UL,
+       0x47b5481dbefa4fa4UL
+};
+
+/* Initial hash value H for SHA-512: */
+static const isc_uint64_t sha512_initial_hash_value[8] = {
+       0x6a09e667f3bcc908UL,
+       0xbb67ae8584caa73bUL,
+       0x3c6ef372fe94f82bUL,
+       0xa54ff53a5f1d36f1UL,
+       0x510e527fade682d1UL,
+       0x9b05688c2b3e6c1fUL,
+       0x1f83d9abfb41bd6bUL,
+       0x5be0cd19137e2179UL
+};
+#else
 /* Hash constant words K for SHA-384 and SHA-512: */
 static const isc_uint64_t K512[80] = {
        0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
@@ -312,6 +448,7 @@ static const isc_uint64_t sha512_initial_hash_value[8] = {
        0x1f83d9abfb41bd6bULL,
        0x5be0cd19137e2179ULL
 };
+#endif
 
 /*
  * Constant used by SHA256/384/512_End() functions for converting the