RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:37:34 +00:00
Code Issues Activity Actions

LibCrypto: Store the TBS ASN.1 data on the certificate

Browse source 
This way we dont need to guess the offsets in LibTLS when using it.
This commit is contained in:
stelar7 2023-04-12 15:05:08 +02:00 • committed by Ali Mohammad Pur
parent 24c7995743
commit 0b70314379
4 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibCrypto/ASN1/DER.cpp
View file

@ -67,6 +67,16 @@ ErrorOr<u8> Decoder::read_byte()
return byte;
}
ErrorOr<ReadonlyBytes> Decoder::peek_entry_bytes()
{
if (m_stack.is_empty())
return Error::from_string_literal("ASN1::Decoder: Reading bytes from an empty stack");
auto entry = m_stack.last();
return entry;
}
ErrorOr<ReadonlyBytes> Decoder::read_bytes(size_t length)
{
if (m_stack.is_empty())

2
Userland/Libraries/LibCrypto/ASN1/DER.h
View file

@ -151,6 +151,8 @@ public:
ErrorOr<void> enter();
ErrorOr<void> leave();
ErrorOr<ReadonlyBytes> peek_entry_bytes();
private:
template<typename ValueType, typename DecodedType>
ErrorOr<ValueType> with_type_check(DecodedType&& value)

12
Userland/Libraries/LibTLS/Certificate.cpp
View file

@ -680,9 +680,21 @@ static ErrorOr<Certificate> parse_tbs_certificate(Crypto::ASN1::Decoder& decoder
// -- If present, version shall be v3]]
// }
// Note: Parse out the ASN.1 of this object, since its used for TLS verification.
// To do this, we get the bytes of our parent, the size of ourself, and slice the parent buffer.
auto pre_cert_buffer = TRY(decoder.peek_entry_bytes());
// FIXME: Dont assume this value.
// Note: we assume this to be 4. 1 for the tag, and 3 for the length.
auto entry_length_byte_count = 4;
ENTER_TYPED_SCOPE(Sequence, "TBSCertificate"sv);
auto post_cert_buffer = TRY(decoder.peek_entry_bytes());
auto asn1_data = TRY(ByteBuffer::copy(pre_cert_buffer.slice(0, post_cert_buffer.size() + entry_length_byte_count)));
Certificate certificate;
certificate.tbs_asn1 = asn1_data;
certificate.version = TRY(parse_version(decoder, current_scope)).to_u64();
certificate.serial_number = TRY(parse_serial_number(decoder, current_scope));
certificate.algorithm = TRY(parse_algorithm_identifier(decoder, current_scope));

1
Userland/Libraries/LibTLS/Certificate.h
View file

@ -271,6 +271,7 @@ public:
AlgorithmIdentifier signature_algorithm;
ByteBuffer signature_value {};
ByteBuffer original_asn1 {};
ByteBuffer tbs_asn1 {};
bool is_allowed_to_sign_certificate { false };
bool is_certificate_authority { false };
Optional<size_t> path_length_constraint {};