From: ishmal Date: Tue, 22 Apr 2008 20:44:40 +0000 (+0000) Subject: Final format and comment fix. Sorry. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=442d9f213abc56c377c5af81fd69551dbc5aa07f;p=inkscape.git Final format and comment fix. Sorry. --- diff --git a/src/dom/util/digest.cpp b/src/dom/util/digest.cpp index ea2395798..61918c5c9 100644 --- a/src/dom/util/digest.cpp +++ b/src/dom/util/digest.cpp @@ -353,22 +353,22 @@ std::vector Sha1::finish() static unsigned long sha256table[64] = { -0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, -0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, -0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL, -0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL, -0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, -0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, -0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, -0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL, -0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL, -0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, -0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, -0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, -0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL, -0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL, -0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, -0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL + 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, + 0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, + 0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL, + 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL, + 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, + 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, + 0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, + 0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL, + 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL, + 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, + 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, + 0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, + 0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL, + 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL, + 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, + 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL }; @@ -662,48 +662,48 @@ std::vector Sha256::finish() #define SHA_sigma1(x) (SHA_Rot64(x, 19) ^ SHA_Rot64(x, 61) ^ ((x) >> 6)) -static unsigned long long sha512constants[80] = +static unsigned long long sha512table[80] = { -0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, -0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, -0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, -0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, -0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, -0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, -0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, -0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, -0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, -0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, -0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, -0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, -0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, -0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, -0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, -0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, -0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, -0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, -0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, -0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, -0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, -0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, -0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, -0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, -0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, -0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, -0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, -0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, -0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, -0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, -0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, -0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, -0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, -0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, -0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, -0x113f9804bef90daeULL, 0x1b710b35131c471bULL, -0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, -0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, -0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, -0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, + 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, + 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, + 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, + 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, + 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, + 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, + 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, + 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, + 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, + 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, + 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, + 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, + 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, + 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, + 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, + 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, + 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, + 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, + 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, + 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, + 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, + 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, + 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, + 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, + 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, + 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, + 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, + 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, + 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, + 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, + 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, + 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, + 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, + 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, + 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, + 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, + 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, + 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL }; @@ -737,7 +737,8 @@ void Sha384::reset() /** - * + * Note that this version of update() handles 64-bit inBuf + * values. */ void Sha384::update(unsigned char ch) { @@ -793,7 +794,7 @@ void Sha384::transform() { //see 4.1.1 for the boolops unsigned long long T1 = TR64(h + SHA_SIGMA1(e) + SHA_Ch(e,f,g) + - sha512constants[t] + W[t]); + sha512table[t] + W[t]); unsigned long long T2 = TR64(SHA_SIGMA0(a) + SHA_Maj(a,b,c)); h = g; g = f; f = e; e = TR64(d + T1); d = c; c = b; b = a; a = TR64(T1 + T2); } @@ -892,7 +893,8 @@ void Sha512::reset() /** - * + * Note that this version of update() handles 64-bit inBuf + * values. */ void Sha512::update(unsigned char ch) { @@ -948,7 +950,7 @@ void Sha512::transform() { //see 4.1.1 for the boolops unsigned long long T1 = TR64(h + SHA_SIGMA1(e) + SHA_Ch(e,f,g) + - sha512constants[t] + W[t]); + sha512table[t] + W[t]); unsigned long long T2 = TR64(SHA_SIGMA0(a) + SHA_Maj(a,b,c)); h = g; g = f; f = e; e = TR64(d + T1); d = c; c = b; b = a; a = TR64(T1 + T2); } diff --git a/src/dom/util/digest.h b/src/dom/util/digest.h index 61b896537..de6d39157 100644 --- a/src/dom/util/digest.h +++ b/src/dom/util/digest.h @@ -59,6 +59,7 @@ * The SHA algorithms are derived directly from FIPS-180-3. The * SHA tests at the bottom of digest.cpp are also directly from * that document. + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf * * The MD5 algorithm is from RFC 1321 * @@ -180,6 +181,7 @@ public: /** * Convenience method. This is a simple way of getting a hash. + * Returns a byte buffer with the digest output. * call with: std::vector digest = * Digest::hash(Digest::HASH_XXX, buf, len); */ @@ -188,6 +190,7 @@ public: int len); /** * Convenience method. This is a simple way of getting a hash. + * Returns a byte buffer with the digest output. * call with: std::vector digest = * Digest::hash(Digest::HASH_XXX, str); */ @@ -196,6 +199,7 @@ public: /** * Convenience method. This is a simple way of getting a hash. + * Returns a string with the hexidecimal form of the digest output. * call with: std::string digest = * Digest::hash(Digest::HASH_XXX, buf, len); */ @@ -204,6 +208,7 @@ public: int len); /** * Convenience method. This is a simple way of getting a hash. + * Returns a string with the hexidecimal form of the digest output. * call with: std::string digest = * Digest::hash(Digest::HASH_XXX, str); */ @@ -301,7 +306,7 @@ protected: * SHA-1, * Section 6.1, SECURE HASH STANDARD * Federal Information Processing Standards Publication 180-2 - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf */ class Sha1 : public Digest { @@ -361,7 +366,7 @@ private: * SHA-224, * Section 6.1, SECURE HASH STANDARD * Federal Information Processing Standards Publication 180-2 - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf */ class Sha224 : public Digest { @@ -417,7 +422,7 @@ private: * SHA-256, * Section 6.1, SECURE HASH STANDARD * Federal Information Processing Standards Publication 180-2 - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf */ class Sha256 : public Digest { @@ -473,7 +478,7 @@ private: * SHA-384, * Section 6.1, SECURE HASH STANDARD * Federal Information Processing Standards Publication 180-2 - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf */ class Sha384 : public Digest { @@ -532,7 +537,7 @@ private: * SHA-512, * Section 6.1, SECURE HASH STANDARD * Federal Information Processing Standards Publication 180-2 - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf + * http://csrc.nist.gov/publications/drafts/fips_180-3/draft_fips-180-3_June-08-2007.pdf */ class Sha512 : public Digest {