mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 13:07:46 +00:00
LibCrypto+LibTLS: Generalize the elliptic curve interface
These changes generalize the interface with an elliptic curve implementation. This allows LibTLS to support elliptic curves generally without needing the specifics of elliptic curve implementations. This should allow for easier addition of other elliptic curves.
This commit is contained in:
Michiel Visser
Ali Mohammad Pur
parent
21bbff0349
commit
c1b041e761
10 changed files with 133 additions and 122 deletions
|
|
@ -197,23 +197,6 @@ enum class NamedCurve : u16 {
|
|||
x448 = 30,
|
||||
};
|
||||
|
||||
constexpr size_t named_curve_key_size(NamedCurve group)
|
||||
{
|
||||
switch (group) {
|
||||
case NamedCurve::secp256r1:
|
||||
case NamedCurve::secp384r1:
|
||||
case NamedCurve::secp521r1:
|
||||
// FIXME: Add the correct key size for these elliptic curves
|
||||
return 0;
|
||||
case NamedCurve::x25519:
|
||||
return 256;
|
||||
case NamedCurve::x448:
|
||||
return 448;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
enum class ECPointFormat : u8 {
|
||||
Uncompressed = 0,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@
|
|||
#include <AK/Random.h>
|
||||
#include <LibCrypto/ASN1/DER.h>
|
||||
#include <LibCrypto/BigInt/UnsignedBigInteger.h>
|
||||
#include <LibCrypto/Curves/X25519.h>
|
||||
#include <LibCrypto/Curves/X448.h>
|
||||
#include <LibCrypto/NumberTheory/ModularFunctions.h>
|
||||
#include <LibCrypto/PK/Code/EMSA_PSS.h>
|
||||
#include <LibTLS/TLSv12.h>
|
||||
|
|
@ -295,86 +293,44 @@ void TLSv12::build_dhe_rsa_pre_master_secret(PacketBuilder& builder)
|
|||
builder.append(dh_Yc_bytes);
|
||||
}
|
||||
|
||||
ErrorOr<ByteBuffer> TLSv12::named_curve_multiply(NamedCurve curve, ReadonlyBytes a, ReadonlyBytes b)
|
||||
{
|
||||
switch (curve) {
|
||||
case NamedCurve::x25519:
|
||||
return Crypto::Curves::X25519::compute_coordinate(a, b);
|
||||
case NamedCurve::x448:
|
||||
return Crypto::Curves::X448::compute_coordinate(a, b);
|
||||
default:
|
||||
dbgln("No known handler for multiplying curve {}", static_cast<u16>(curve));
|
||||
TODO();
|
||||
}
|
||||
}
|
||||
|
||||
ErrorOr<ByteBuffer> TLSv12::named_curve_generator_point(NamedCurve curve)
|
||||
{
|
||||
auto key_size = named_curve_key_size(curve) / 8;
|
||||
|
||||
auto generator_point_data_result = ByteBuffer::create_zeroed(key_size);
|
||||
if (generator_point_data_result.is_error()) {
|
||||
dbgln("Failed to generate curve multiplication point: not enough memory");
|
||||
return AK::Error::from_string_literal("Failed to generate curve multiplication point: not enough memory");
|
||||
}
|
||||
auto generator_point_data = generator_point_data_result.release_value();
|
||||
|
||||
switch (curve) {
|
||||
case NamedCurve::x25519:
|
||||
ByteReader::store(generator_point_data.offset_pointer(0), 9);
|
||||
break;
|
||||
case NamedCurve::x448:
|
||||
ByteReader::store(generator_point_data.offset_pointer(0), 5);
|
||||
break;
|
||||
default:
|
||||
dbgln("No known handler for generator point of curve {}", static_cast<u16>(curve));
|
||||
TODO();
|
||||
}
|
||||
|
||||
return generator_point_data;
|
||||
}
|
||||
|
||||
void TLSv12::build_ecdhe_rsa_pre_master_secret(PacketBuilder& builder)
|
||||
{
|
||||
size_t const key_size = named_curve_key_size(m_context.server_curve_choice) / 8;
|
||||
auto generator_point_result = named_curve_generator_point(m_context.server_curve_choice);
|
||||
if (generator_point_result.is_error()) {
|
||||
dbgln("Failed to build ECDHE_RSA premaster secret: not enough memory");
|
||||
return;
|
||||
}
|
||||
auto generator_point = generator_point_result.release_value();
|
||||
ReadonlyBytes generator_point_bytes = generator_point;
|
||||
|
||||
// Create a random private key
|
||||
auto private_key_result = ByteBuffer::create_uninitialized(key_size);
|
||||
auto private_key_result = m_context.server_key_exchange_curve->generate_private_key();
|
||||
if (private_key_result.is_error()) {
|
||||
dbgln("Failed to build ECDHE_RSA premaster secret: not enough memory");
|
||||
return;
|
||||
}
|
||||
auto private_key = private_key_result.release_value();
|
||||
fill_with_random(private_key.data(), key_size);
|
||||
ReadonlyBytes private_key_bytes = private_key;
|
||||
|
||||
// Calculate the public key by multiplying the private key with the generator point
|
||||
auto public_key_result = named_curve_multiply(m_context.server_curve_choice, private_key_bytes, generator_point_bytes);
|
||||
// Calculate the public key from the private key
|
||||
auto public_key_result = m_context.server_key_exchange_curve->generate_public_key(private_key);
|
||||
if (public_key_result.is_error()) {
|
||||
dbgln("Failed to build ECDHE_RSA premaster secret: not enough memory");
|
||||
return;
|
||||
}
|
||||
auto public_key = public_key_result.release_value();
|
||||
|
||||
// Calculate the pre master secret by multiplying the client private key and the server public key
|
||||
// Calculate the shared point by multiplying the client private key and the server public key
|
||||
ReadonlyBytes server_public_key_bytes = m_context.server_diffie_hellman_params.p;
|
||||
auto pre_master_secret_result = named_curve_multiply(m_context.server_curve_choice, private_key_bytes, server_public_key_bytes);
|
||||
if (pre_master_secret_result.is_error()) {
|
||||
auto shared_point_result = m_context.server_key_exchange_curve->compute_coordinate(private_key, server_public_key_bytes);
|
||||
if (shared_point_result.is_error()) {
|
||||
dbgln("Failed to build ECDHE_RSA premaster secret: not enough memory");
|
||||
return;
|
||||
}
|
||||
m_context.premaster_key = pre_master_secret_result.release_value();
|
||||
auto shared_point = shared_point_result.release_value();
|
||||
|
||||
// Derive the premaster key from the shared point
|
||||
auto premaster_key_result = m_context.server_key_exchange_curve->derive_premaster_key(shared_point);
|
||||
if (premaster_key_result.is_error()) {
|
||||
dbgln("Failed to build ECDHE_RSA premaster secret: not enough memory");
|
||||
return;
|
||||
}
|
||||
m_context.premaster_key = premaster_key_result.release_value();
|
||||
|
||||
if constexpr (TLS_DEBUG) {
|
||||
dbgln("Build ECDHE_RSA pre master secret");
|
||||
dbgln("client private key: {:hex-dump}", private_key_bytes);
|
||||
dbgln("client private key: {:hex-dump}", (ReadonlyBytes)private_key);
|
||||
dbgln("client public key: {:hex-dump}", (ReadonlyBytes)public_key);
|
||||
dbgln("premaster key: {:hex-dump}", (ReadonlyBytes)m_context.premaster_key);
|
||||
}
|
||||
|
|
@ -384,8 +340,8 @@ void TLSv12::build_ecdhe_rsa_pre_master_secret(PacketBuilder& builder)
|
|||
return;
|
||||
}
|
||||
|
||||
builder.append_u24(key_size + 1);
|
||||
builder.append((u8)key_size);
|
||||
builder.append_u24(public_key.size() + 1);
|
||||
builder.append((u8)public_key.size());
|
||||
builder.append(public_key);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
|
||||
#include <LibCore/Timer.h>
|
||||
#include <LibCrypto/ASN1/DER.h>
|
||||
#include <LibCrypto/Curves/EllipticCurve.h>
|
||||
#include <LibCrypto/Curves/X25519.h>
|
||||
#include <LibCrypto/Curves/X448.h>
|
||||
#include <LibCrypto/PK/Code/EMSA_PKCS1_V1_5.h>
|
||||
#include <LibCrypto/PK/Code/EMSA_PSS.h>
|
||||
#include <LibTLS/TLSv12.h>
|
||||
|
|
@ -290,8 +293,7 @@ ssize_t TLSv12::handle_dhe_rsa_server_key_exchange(ReadonlyBytes buffer)
|
|||
|
||||
ssize_t TLSv12::handle_ecdhe_rsa_server_key_exchange(ReadonlyBytes buffer)
|
||||
{
|
||||
size_t size_required_for_curve_name = 6;
|
||||
if (buffer.size() < size_required_for_curve_name)
|
||||
if (buffer.size() < 7)
|
||||
return (i8)Error::NeedMoreData;
|
||||
|
||||
auto curve_type = buffer[3];
|
||||
|
|
@ -302,14 +304,23 @@ ssize_t TLSv12::handle_ecdhe_rsa_server_key_exchange(ReadonlyBytes buffer)
|
|||
if (!m_context.options.elliptic_curves.contains_slow(curve))
|
||||
return (i8)Error::NotUnderstood;
|
||||
|
||||
m_context.server_curve_choice = curve;
|
||||
auto curve_key_size_bytes = named_curve_key_size(curve) / 8;
|
||||
if (buffer.size() < curve_key_size_bytes + 1)
|
||||
return (i8)Error::NeedMoreData;
|
||||
switch ((NamedCurve)curve) {
|
||||
case NamedCurve::x25519:
|
||||
m_context.server_key_exchange_curve = make<Crypto::Curves::X25519>();
|
||||
break;
|
||||
case NamedCurve::x448:
|
||||
m_context.server_key_exchange_curve = make<Crypto::Curves::X448>();
|
||||
break;
|
||||
default:
|
||||
return (i8)Error::NotUnderstood;
|
||||
}
|
||||
|
||||
auto server_public_key_length = buffer[6];
|
||||
if (server_public_key_length != curve_key_size_bytes)
|
||||
return (i8)Error::FeatureNotSupported;
|
||||
if (server_public_key_length != m_context.server_key_exchange_curve->key_size())
|
||||
return (i8)Error::NotUnderstood;
|
||||
|
||||
if (buffer.size() < 7u + server_public_key_length)
|
||||
return (i8)Error::NeedMoreData;
|
||||
|
||||
auto server_public_key = buffer.slice(7, server_public_key_length);
|
||||
auto server_public_key_copy_result = ByteBuffer::copy(server_public_key);
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <LibCrypto/Authentication/HMAC.h>
|
||||
#include <LibCrypto/BigInt/UnsignedBigInteger.h>
|
||||
#include <LibCrypto/Cipher/AES.h>
|
||||
#include <LibCrypto/Curves/EllipticCurve.h>
|
||||
#include <LibCrypto/Hash/HashManager.h>
|
||||
#include <LibCrypto/PK/RSA.h>
|
||||
#include <LibTLS/CipherSuite.h>
|
||||
|
|
@ -334,7 +335,7 @@ struct Context {
|
|||
ByteBuffer Ys;
|
||||
} server_diffie_hellman_params;
|
||||
|
||||
NamedCurve server_curve_choice;
|
||||
OwnPtr<Crypto::Curves::EllipticCurve> server_key_exchange_curve;
|
||||
};
|
||||
|
||||
class TLSv12 final : public Core::Stream::Socket {
|
||||
|
|
@ -465,9 +466,6 @@ private:
|
|||
void build_dhe_rsa_pre_master_secret(PacketBuilder&);
|
||||
void build_ecdhe_rsa_pre_master_secret(PacketBuilder&);
|
||||
|
||||
static ErrorOr<ByteBuffer> named_curve_multiply(NamedCurve curve, ReadonlyBytes a, ReadonlyBytes b);
|
||||
static ErrorOr<ByteBuffer> named_curve_generator_point(NamedCurve curve);
|
||||
|
||||
ErrorOr<bool> flush();
|
||||
void write_into_socket();
|
||||
ErrorOr<void> read_from_socket();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue