diff --git a/Libraries/LibCrypto/Hash/HashFunction.h b/Libraries/LibCrypto/Hash/HashFunction.h index bdb132543ca..9d2f2bf53c3 100644 --- a/Libraries/LibCrypto/Hash/HashFunction.h +++ b/Libraries/LibCrypto/Hash/HashFunction.h @@ -48,7 +48,9 @@ namespace Hash { virtual void update(const ByteBuffer& buffer) = 0; virtual void update(const StringView& string) = 0; + virtual DigestType peek() = 0; virtual DigestType digest() = 0; + virtual String class_name() const = 0; }; } diff --git a/Libraries/LibCrypto/Hash/MD5.cpp b/Libraries/LibCrypto/Hash/MD5.cpp index 34d3481d0e9..3d31dd814e0 100644 --- a/Libraries/LibCrypto/Hash/MD5.cpp +++ b/Libraries/LibCrypto/Hash/MD5.cpp @@ -91,6 +91,13 @@ namespace Hash { m_buffer.overwrite(index, &input[offset], length - offset); } MD5::DigestType MD5::digest() + { + auto digest = peek(); + reset(); + return digest; + } + + MD5::DigestType MD5::peek() { DigestType digest; u8 bits[8]; @@ -108,8 +115,6 @@ namespace Hash { // store state (4 registers ABCD) encode(&m_A, digest.data, 4 * sizeof(m_A)); - reset(); - return digest; } diff --git a/Libraries/LibCrypto/Hash/MD5.h b/Libraries/LibCrypto/Hash/MD5.h index 61700c75ad6..303ea7bfb4a 100644 --- a/Libraries/LibCrypto/Hash/MD5.h +++ b/Libraries/LibCrypto/Hash/MD5.h @@ -79,6 +79,7 @@ namespace Hash { virtual void update(const ByteBuffer& buffer) override { update(buffer.data(), buffer.size()); }; virtual void update(const StringView& string) override { update((const u8*)string.characters_without_null_termination(), string.length()); }; virtual DigestType digest() override; + virtual DigestType peek() override; virtual String class_name() const override { return "MD5"; } diff --git a/Libraries/LibCrypto/Hash/SHA2.cpp b/Libraries/LibCrypto/Hash/SHA2.cpp index f990b797eb1..6073276b411 100644 --- a/Libraries/LibCrypto/Hash/SHA2.cpp +++ b/Libraries/LibCrypto/Hash/SHA2.cpp @@ -37,12 +37,20 @@ namespace Hash { constexpr inline static auto SIGN0(u32 x) { return ROTRIGHT(x, 7) ^ ROTRIGHT(x, 18) ^ (x >> 3); } constexpr inline static auto SIGN1(u32 x) { return ROTRIGHT(x, 17) ^ ROTRIGHT(x, 19) ^ (x >> 10); } + constexpr inline static auto ROTRIGHT(u64 a, size_t b) { return (a >> b) | (a << (64 - b)); } + constexpr inline static auto CH(u64 x, u64 y, u64 z) { return (x & y) ^ (z & ~x); } + constexpr inline static auto MAJ(u64 x, u64 y, u64 z) { return (x & y) ^ (x & z) ^ (y & z); } + constexpr inline static auto EP0(u64 x) { return ROTRIGHT(x, 28) ^ ROTRIGHT(x, 34) ^ ROTRIGHT(x, 39); } + constexpr inline static auto EP1(u64 x) { return ROTRIGHT(x, 14) ^ ROTRIGHT(x, 18) ^ ROTRIGHT(x, 41); } + constexpr inline static auto SIGN0(u64 x) { return ROTRIGHT(x, 1) ^ ROTRIGHT(x, 8) ^ (x >> 7); } + constexpr inline static auto SIGN1(u64 x) { return ROTRIGHT(x, 19) ^ ROTRIGHT(x, 61) ^ (x >> 6); } + inline void SHA256::transform(const u8* data) { u32 m[64]; size_t i = 0; - for (size_t j = 0; i < BlockSize / 4; ++i, j += 4) { + for (size_t j = 0; i < 16; ++i, j += 4) { m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | data[j + 3]; } @@ -55,7 +63,7 @@ namespace Hash { e = m_state[4], f = m_state[5], g = m_state[6], h = m_state[7]; - for (size_t i = 0; i < BlockSize; ++i) { + for (size_t i = 0; i < Rounds; ++i) { auto temp0 = h + EP1(e) + CH(e, f, g) + SHA256Constants::RoundConstants[i] + m[i]; auto temp1 = EP0(a) + MAJ(a, b, c); h = g; @@ -91,6 +99,13 @@ namespace Hash { } SHA256::DigestType SHA256::digest() + { + auto digest = peek(); + reset(); + return digest; + } + + SHA256::DigestType SHA256::peek() { DigestType digest; size_t i = m_data_length; @@ -135,9 +150,114 @@ namespace Hash { digest.data[i + 24] = (m_state[6] >> (24 - i * 8)) & 0x000000ff; digest.data[i + 28] = (m_state[7] >> (24 - i * 8)) & 0x000000ff; } + return digest; + } + inline void SHA512::transform(const u8* data) + { + u64 m[80]; + + size_t i = 0; + for (size_t j = 0; i < 16; ++i, j += 8) { + m[i] = ((u64)data[j] << 56) | ((u64)data[j + 1] << 48) | ((u64)data[j + 2] << 40) | ((u64)data[j + 3] << 32) | ((u64)data[j + 4] << 24) | ((u64)data[j + 5] << 16) | ((u64)data[j + 6] << 8) | (u64)data[j + 7]; + } + + for (; i < Rounds; ++i) { + m[i] = SIGN1(m[i - 2]) + m[i - 7] + SIGN0(m[i - 15]) + m[i - 16]; + } + + auto a = m_state[0], b = m_state[1], + c = m_state[2], d = m_state[3], + e = m_state[4], f = m_state[5], + g = m_state[6], h = m_state[7]; + + for (size_t i = 0; i < Rounds; ++i) { + auto temp0 = h + EP1(e) + CH(e, f, g) + SHA512Constants::RoundConstants[i] + m[i]; + auto temp1 = EP0(a) + MAJ(a, b, c); + h = g; + g = f; + f = e; + e = d + temp0; + d = c; + c = b; + b = a; + a = temp0 + temp1; + } + + m_state[0] += a; + m_state[1] += b; + m_state[2] += c; + m_state[3] += d; + m_state[4] += e; + m_state[5] += f; + m_state[6] += g; + m_state[7] += h; + } + + void SHA512::update(const u8* message, size_t length) + { + for (size_t i = 0; i < length; ++i) { + if (m_data_length == BlockSize) { + transform(m_data_buffer); + m_bit_length += 1024; + m_data_length = 0; + } + m_data_buffer[m_data_length++] = message[i]; + } + } + + SHA512::DigestType SHA512::digest() + { + auto digest = peek(); reset(); + return digest; + } + SHA512::DigestType SHA512::peek() + { + DigestType digest; + size_t i = m_data_length; + + if (m_data_length < FinalBlockDataSize) { + m_data_buffer[i++] = 0x80; + while (i < FinalBlockDataSize) + m_data_buffer[i++] = 0x00; + + } else { + m_data_buffer[i++] = 0x80; + while (i < BlockSize) + m_data_buffer[i++] = 0x00; + + transform(m_data_buffer); + __builtin_memset(m_data_buffer, 0, FinalBlockDataSize); + } + + // append total message length + m_bit_length += m_data_length * 8; + m_data_buffer[BlockSize - 1] = m_bit_length; + m_data_buffer[BlockSize - 2] = m_bit_length >> 8; + m_data_buffer[BlockSize - 3] = m_bit_length >> 16; + m_data_buffer[BlockSize - 4] = m_bit_length >> 24; + m_data_buffer[BlockSize - 5] = m_bit_length >> 32; + m_data_buffer[BlockSize - 6] = m_bit_length >> 40; + m_data_buffer[BlockSize - 7] = m_bit_length >> 48; + m_data_buffer[BlockSize - 8] = m_bit_length >> 56; + + transform(m_data_buffer); + + // SHA uses big-endian and we assume little-endian + // FIXME: looks like a thing for AK::NetworkOrdered, + // but he doesn't support shifting operations + for (size_t i = 0; i < 8; ++i) { + digest.data[i + 0] = (m_state[0] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 8] = (m_state[1] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 16] = (m_state[2] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 24] = (m_state[3] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 32] = (m_state[4] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 40] = (m_state[5] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 48] = (m_state[6] >> (56 - i * 8)) & 0x000000ff; + digest.data[i + 56] = (m_state[7] >> (56 - i * 8)) & 0x000000ff; + } return digest; } } diff --git a/Libraries/LibCrypto/Hash/SHA2.h b/Libraries/LibCrypto/Hash/SHA2.h index 0d25750c498..3fea80ae985 100644 --- a/Libraries/LibCrypto/Hash/SHA2.h +++ b/Libraries/LibCrypto/Hash/SHA2.h @@ -59,6 +59,32 @@ namespace Hash { }; } + namespace SHA512Constants { + constexpr static u64 RoundConstants[80] { + 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc, 0x3956c25bf348b538, + 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118, 0xd807aa98a3030242, 0x12835b0145706fbe, + 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, 0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, + 0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, + 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5, 0x983e5152ee66dfab, + 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4, 0xc6e00bf33da88fc2, 0xd5a79147930aa725, + 0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, + 0x53380d139d95b3df, 0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b, + 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30, 0xd192e819d6ef5218, + 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8, 0x19a4c116b8d2d0c8, 0x1e376c085141ab53, + 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, + 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec, + 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b, 0xca273eceea26619c, + 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x06f067aa72176fba, 0x0a637dc5a2c898a6, + 0x113f9804bef90dae, 0x1b710b35131c471b, 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, + 0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 + }; + + constexpr static u64 InitializationHashes[8] = { + 0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1, + 0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179 + }; + } + template struct SHA2Digest { u8 data[Bytes]; @@ -78,6 +104,7 @@ namespace Hash { virtual void update(const StringView& string) override { update((const u8*)string.characters_without_null_termination(), string.length()); }; virtual DigestType digest() override; + virtual DigestType peek() override; inline static DigestType hash(const u8* data, size_t length) { @@ -114,6 +141,60 @@ namespace Hash { u32 m_state[8]; constexpr static auto FinalBlockDataSize = BlockSize - 8; + constexpr static auto Rounds = 64; + }; + + class SHA512 final : public HashFunction<1024, SHA2Digest<512 / 8>> { + public: + SHA512() + { + reset(); + } + + virtual void update(const u8*, size_t) override; + + virtual void update(const ByteBuffer& buffer) override { update(buffer.data(), buffer.size()); }; + virtual void update(const StringView& string) override { update((const u8*)string.characters_without_null_termination(), string.length()); }; + + virtual DigestType digest() override; + virtual DigestType peek() override; + + inline static DigestType hash(const u8* data, size_t length) + { + SHA512 sha; + sha.update(data, length); + return sha.digest(); + } + + inline static DigestType hash(const ByteBuffer& buffer) { return hash(buffer.data(), buffer.size()); } + inline static DigestType hash(const StringView& buffer) { return hash((const u8*)buffer.characters_without_null_termination(), buffer.length()); } + + virtual String class_name() const override + { + StringBuilder builder; + builder.append("SHA"); + builder.appendf("%zu", this->DigestSize * 8); + return builder.build(); + }; + + private: + inline void transform(const u8*); + inline void reset() + { + m_data_length = 0; + m_bit_length = 0; + for (size_t i = 0; i < 8; ++i) + m_state[i] = SHA512Constants::InitializationHashes[i]; + } + + u8 m_data_buffer[BlockSize]; + size_t m_data_length { 0 }; + + u64 m_bit_length { 0 }; + u64 m_state[8]; + + constexpr static auto FinalBlockDataSize = BlockSize - 8; + constexpr static auto Rounds = 80; }; } diff --git a/Userland/test-crypto.cpp b/Userland/test-crypto.cpp index 217b992af6a..4259d1ad095 100644 --- a/Userland/test-crypto.cpp +++ b/Userland/test-crypto.cpp @@ -28,10 +28,12 @@ int aes_cbc_tests(); // Hash int md5_tests(); int sha256_tests(); +int sha512_tests(); // Authentication int hmac_md5_tests(); int hmac_sha256_tests(); +int hmac_sha512_tests(); // stop listing tests @@ -134,6 +136,25 @@ void hmac_sha256(const char* message, size_t len) print_buffer(ByteBuffer::wrap(mac.data, hmac.DigestSize), -1); } +void sha512(const char* message, size_t len) +{ + auto digest = Crypto::Hash::SHA512::hash((const u8*)message, len); + if (binary) + printf("%.*s", (int)Crypto::Hash::SHA512::digest_size(), digest.data); + else + print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::SHA512::digest_size()), -1); +} + +void hmac_sha512(const char* message, size_t len) +{ + Crypto::Authentication::HMAC hmac(secret_key); + auto mac = hmac.process((const u8*)message, len); + if (binary) + printf("%.*s", (int)hmac.DigestSize, mac.data); + else + print_buffer(ByteBuffer::wrap(mac.data, hmac.DigestSize), -1); +} + auto main(int argc, char** argv) -> int { const char* mode = nullptr; @@ -175,6 +196,11 @@ auto main(int argc, char** argv) -> int return sha256_tests(); return run(sha256); } + if (suite_sv == "SHA512") { + if (run_tests) + return sha512_tests(); + return run(sha512); + } printf("unknown hash function '%s'\n", suite); return 1; } @@ -193,6 +219,11 @@ auto main(int argc, char** argv) -> int return hmac_sha256_tests(); return run(hmac_sha256); } + if (suite_sv == "HMAC-SHA512") { + if (run_tests) + return hmac_sha512_tests(); + return run(hmac_sha512); + } printf("unknown hash function '%s'\n", suite); return 1; } @@ -251,12 +282,18 @@ void md5_test_consecutive_updates(); void sha256_test_name(); void sha256_test_hash(); +void sha512_test_name(); +void sha512_test_hash(); + void hmac_md5_test_name(); void hmac_md5_test_process(); void hmac_sha256_test_name(); void hmac_sha256_test_process(); +void hmac_sha512_test_name(); +void hmac_sha512_test_process(); + int aes_cbc_tests() { aes_cbc_test_name(); @@ -529,6 +566,13 @@ int hmac_sha256_tests() return 0; } +int hmac_sha512_tests() +{ + hmac_sha512_test_name(); + hmac_sha512_test_process(); + return 0; +} + void hmac_md5_test_name() { I_TEST((HMAC - MD5 | Class name)); @@ -652,3 +696,88 @@ void hmac_sha256_test_process() PASS; } } + +int sha512_tests() +{ + sha512_test_name(); + sha512_test_hash(); + return 0; +} + +void sha512_test_name() +{ + I_TEST((SHA512 class name)); + Crypto::Hash::SHA512 sha; + if (sha.class_name() != "SHA512") { + FAIL(Invalid class name); + printf("%s\n", sha.class_name().characters()); + } else + PASS; +} + +void sha512_test_hash() +{ + { + I_TEST((SHA512 Hashing | "Well hello friends")); + u8 result[] { + 0x00, 0xfe, 0x68, 0x09, 0x71, 0x0e, 0xcb, 0x2b, 0xe9, 0x58, 0x00, 0x13, 0x69, 0x6a, 0x9e, 0x9e, 0xbd, 0x09, 0x1b, 0xfe, 0x14, 0xc9, 0x13, 0x82, 0xc7, 0x40, 0x34, 0xfe, 0xca, 0xe6, 0x87, 0xcb, 0x26, 0x36, 0x92, 0xe6, 0x34, 0x94, 0x3a, 0x11, 0xe5, 0xbb, 0xb5, 0xeb, 0x8e, 0x70, 0xef, 0x64, 0xca, 0xf7, 0x21, 0xb1, 0xde, 0xf2, 0x34, 0x85, 0x6f, 0xa8, 0x56, 0xd8, 0x23, 0xa1, 0x3b, 0x29 + }; + auto digest = Crypto::Hash::SHA512::hash("Well hello friends"); + if (memcmp(result, digest.data, Crypto::Hash::SHA512::digest_size()) != 0) { + FAIL(Invalid hash); + print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::SHA512::digest_size()), -1); + } else + PASS; + } + { + I_TEST((SHA512 Hashing | "")); + u8 result[] { + 0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, 0xd6, 0x20, 0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc, 0x83, 0xf4, 0xa9, 0x21, 0xd3, 0x6c, 0xe9, 0xce, 0x47, 0xd0, 0xd1, 0x3c, 0x5d, 0x85, 0xf2, 0xb0, 0xff, 0x83, 0x18, 0xd2, 0x87, 0x7e, 0xec, 0x2f, 0x63, 0xb9, 0x31, 0xbd, 0x47, 0x41, 0x7a, 0x81, 0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda, 0x3e + }; + auto digest = Crypto::Hash::SHA512::hash(""); + if (memcmp(result, digest.data, Crypto::Hash::SHA512::digest_size()) != 0) { + FAIL(Invalid hash); + print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::SHA512::digest_size()), -1); + } else + PASS; + } +} + +void hmac_sha512_test_name() +{ + I_TEST((HMAC - SHA512 | Class name)); + Crypto::Authentication::HMAC hmac("Well Hello Friends"); + if (hmac.class_name() != "HMAC-SHA512") + FAIL(Invalid class name); + else + PASS; +} + +void hmac_sha512_test_process() +{ + { + I_TEST((HMAC - SHA512 | Basic)); + Crypto::Authentication::HMAC hmac("Well Hello Friends"); + u8 result[] { + 0xeb, 0xa8, 0x34, 0x11, 0xfd, 0x5b, 0x46, 0x5b, 0xef, 0xbb, 0x67, 0x5e, 0x7d, 0xc2, 0x7c, 0x2c, 0x6b, 0xe1, 0xcf, 0xe6, 0xc7, 0xe4, 0x7d, 0xeb, 0xca, 0x97, 0xb7, 0x4c, 0xd3, 0x4d, 0x6f, 0x08, 0x9f, 0x0d, 0x3a, 0xf1, 0xcb, 0x00, 0x79, 0x78, 0x2f, 0x05, 0x8e, 0xeb, 0x94, 0x48, 0x0d, 0x50, 0x64, 0x3b, 0xca, 0x70, 0xe2, 0x69, 0x38, 0x4f, 0xe4, 0xb0, 0x49, 0x0f, 0xc5, 0x4c, 0x7a, 0xa7 + }; + auto mac = hmac.process("Some bogus data"); + if (memcmp(result, mac.data, hmac.DigestSize) != 0) { + FAIL(Invalid mac); + print_buffer(ByteBuffer::wrap(mac.data, hmac.DigestSize), -1); + } else + PASS; + } + { + I_TEST((HMAC - SHA512 | Reuse)); + Crypto::Authentication::HMAC hmac("Well Hello Friends"); + + auto mac_0 = hmac.process("Some bogus data"); + auto mac_1 = hmac.process("Some bogus data"); + + if (memcmp(mac_0.data, mac_1.data, hmac.DigestSize) != 0) { + FAIL(Cannot reuse); + } else + PASS; + } +}