diff options
author | DexesTTP <dexes.ttp@gmail.com> | 2021-05-29 08:26:10 +0200 |
---|---|---|
committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2021-05-29 13:29:46 +0430 |
commit | 4bbf954ad037e456da48e71fe85dfbbfca84275f (patch) | |
tree | e6b0412fb56e6a9bb5b2e9e039e4cd324e0b62c7 /Userland/Libraries/LibTLS/TLSv12.cpp | |
parent | cb4a0dec8a3f723e8c1eaa261e490052fa1f84f5 (diff) | |
download | serenity-4bbf954ad037e456da48e71fe85dfbbfca84275f.zip |
LibTLS: Allow using other hash algorithms for HMAC
The standard allows for ciphers to define which hash to use.
Fixes #7348
Diffstat (limited to 'Userland/Libraries/LibTLS/TLSv12.cpp')
-rw-r--r-- | Userland/Libraries/LibTLS/TLSv12.cpp | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/Userland/Libraries/LibTLS/TLSv12.cpp b/Userland/Libraries/LibTLS/TLSv12.cpp index f39b201743..3993ce26ad 100644 --- a/Userland/Libraries/LibTLS/TLSv12.cpp +++ b/Userland/Libraries/LibTLS/TLSv12.cpp @@ -232,19 +232,14 @@ bool Context::verify_chain() const return true; } -void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* label, size_t label_length, ReadonlyBytes seed, ReadonlyBytes seed_b) +template<typename HMACType> +static void hmac_pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* label, size_t label_length, ReadonlyBytes seed, ReadonlyBytes seed_b) { if (!secret.size()) { dbgln("null secret"); return; } - // RFC 5246: "In this section, we define one PRF, based on HMAC. This PRF with the - // SHA-256 hash function is used for all cipher suites defined in this - // document and in TLS documents published prior to this document when - // TLS 1.2 is negotiated." - // Apparently this PRF _always_ uses SHA256 - auto append_label_seed = [&](auto& hmac) { hmac.update(label, label_length); hmac.update(seed); @@ -252,7 +247,7 @@ void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* hmac.update(seed_b); }; - Crypto::Authentication::HMAC<Crypto::Hash::SHA256> hmac(secret); + HMACType hmac(secret); append_label_seed(hmac); constexpr auto digest_size = hmac.digest_size(); @@ -276,6 +271,34 @@ void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* } } +void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* label, size_t label_length, ReadonlyBytes seed, ReadonlyBytes seed_b) +{ + // Simplification: We only support the HMAC PRF with the hash function SHA-256 or stronger. + + // RFC 5246: "In this section, we define one PRF, based on HMAC. This PRF with the + // SHA-256 hash function is used for all cipher suites defined in this + // document and in TLS documents published prior to this document when + // TLS 1.2 is negotiated. New cipher suites MUST explicitly specify a + // PRF and, in general, SHOULD use the TLS PRF with SHA-256 or a + // stronger standard hash function." + + switch (hmac_hash()) { + case Crypto::Hash::HashKind::SHA512: + hmac_pseudorandom_function<Crypto::Authentication::HMAC<Crypto::Hash::SHA512>>(output, secret, label, label_length, seed, seed_b); + break; + case Crypto::Hash::HashKind::SHA384: + hmac_pseudorandom_function<Crypto::Authentication::HMAC<Crypto::Hash::SHA384>>(output, secret, label, label_length, seed, seed_b); + break; + case Crypto::Hash::HashKind::SHA256: + hmac_pseudorandom_function<Crypto::Authentication::HMAC<Crypto::Hash::SHA256>>(output, secret, label, label_length, seed, seed_b); + break; + default: + dbgln("Failed to find a suitable HMAC hash"); + VERIFY_NOT_REACHED(); + break; + } +} + TLSv12::TLSv12(Core::Object* parent, Options options) : Core::Socket(Core::Socket::Type::TCP, parent) { |