LibCrypto+LibWeb: Refactor AES implementation with OpenSSL

This commit is contained in:
devgianlu 2025-02-23 19:26:35 +01:00 committed by Ali Mohammad Pur
commit 05f3b1f361
Notes: github-actions[bot] 2025-03-02 14:12:42 +00:00
16 changed files with 339 additions and 2011 deletions

View file

@ -1,6 +1,7 @@
/*
* Copyright (c) 2020, Ali Mohammad Pur <mpfard@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2025, Altomani Gianluca <altomanigianluca@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -8,118 +9,63 @@
#pragma once
#include <AK/ByteString.h>
#include <LibCrypto/Cipher/Cipher.h>
#include <LibCrypto/Cipher/Mode/CBC.h>
#include <LibCrypto/Cipher/Mode/CTR.h>
#include <LibCrypto/Cipher/Mode/GCM.h>
#include <LibCrypto/Cipher/Mode/KW.h>
#include <LibCrypto/OpenSSLForward.h>
namespace Crypto::Cipher {
struct AESCipherBlock : public CipherBlock {
class AESCipher {
public:
static constexpr size_t BlockSizeInBits = 128;
explicit AESCipherBlock(PaddingMode mode = PaddingMode::CMS)
: CipherBlock(mode)
{
}
AESCipherBlock(u8 const* data, size_t length, PaddingMode mode = PaddingMode::CMS)
: AESCipherBlock(mode)
{
CipherBlock::overwrite(data, length);
}
constexpr static size_t block_size() { return BlockSizeInBits / 8; }
virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_data, sizeof(m_data) }; }
virtual Bytes bytes() override { return Bytes { m_data, sizeof(m_data) }; }
virtual void overwrite(ReadonlyBytes) override;
virtual void overwrite(u8 const* data, size_t size) override { overwrite({ data, size }); }
virtual void apply_initialization_vector(ReadonlyBytes ivec) override
{
for (size_t i = 0; i < min(block_size(), ivec.size()); ++i)
m_data[i] ^= ivec[i];
}
ByteString to_byte_string() const;
private:
constexpr static size_t data_size() { return sizeof(m_data); }
u8 m_data[BlockSizeInBits / 8] {};
};
struct AESCipherKey : public CipherKey {
virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_rd_keys, sizeof(m_rd_keys) }; }
virtual void expand_encrypt_key(ReadonlyBytes user_key, size_t bits) override;
virtual void expand_decrypt_key(ReadonlyBytes user_key, size_t bits) override;
static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; }
ByteString to_byte_string() const;
u32 const* round_keys() const
{
return (u32 const*)m_rd_keys;
}
AESCipherKey(ReadonlyBytes user_key, size_t key_bits, Intent intent)
: m_bits(key_bits)
{
if (intent == Intent::Encryption)
expand_encrypt_key(user_key, key_bits);
else
expand_decrypt_key(user_key, key_bits);
}
virtual ~AESCipherKey() override = default;
size_t rounds() const { return m_rounds; }
size_t length() const { return m_bits / 8; }
size_t block_size() const;
protected:
u32* round_keys()
explicit AESCipher(EVP_CIPHER const* cipher, ReadonlyBytes key)
: m_cipher(cipher)
, m_key(key)
{
return (u32*)m_rd_keys;
}
private:
static constexpr size_t MAX_ROUND_COUNT = 14;
u32 m_rd_keys[(MAX_ROUND_COUNT + 1) * 4] { 0 };
size_t m_rounds;
size_t m_bits;
EVP_CIPHER const* m_cipher;
ReadonlyBytes m_key;
};
class AESCipher final : public Cipher<AESCipherKey, AESCipherBlock> {
class AESCBCCipher final : public AESCipher {
public:
using CBCMode = CBC<AESCipher>;
using CTRMode = CTR<AESCipher>;
using GCMMode = GCM<AESCipher>;
using KWMode = KW<AESCipher>;
explicit AESCBCCipher(ReadonlyBytes key, bool no_padding = false);
constexpr static size_t BlockSizeInBits = BlockType::BlockSizeInBits;
ErrorOr<ByteBuffer> encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const;
ErrorOr<ByteBuffer> decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const;
AESCipher(ReadonlyBytes user_key, size_t key_bits, Intent intent = Intent::Encryption, PaddingMode mode = PaddingMode::CMS)
: Cipher<AESCipherKey, AESCipherBlock>(mode)
, m_key(user_key, key_bits, intent)
{
}
private:
bool m_no_padding { false };
};
virtual AESCipherKey const& key() const override { return m_key; }
virtual AESCipherKey& key() override { return m_key; }
class AESCTRCipher final : public AESCipher {
public:
explicit AESCTRCipher(ReadonlyBytes key);
virtual void encrypt_block(BlockType const& in, BlockType& out) override;
virtual void decrypt_block(BlockType const& in, BlockType& out) override;
ErrorOr<ByteBuffer> encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const;
ErrorOr<ByteBuffer> decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const;
};
virtual ByteString class_name() const override
{
return "AES";
}
class AESGCMCipher final : public AESCipher {
public:
explicit AESGCMCipher(ReadonlyBytes key);
protected:
AESCipherKey m_key;
struct EncryptedData {
ByteBuffer ciphertext;
ByteBuffer tag;
};
ErrorOr<EncryptedData> encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv, ReadonlyBytes aad, size_t taglen) const;
ErrorOr<ByteBuffer> decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv, ReadonlyBytes aad, ReadonlyBytes tag) const;
};
class AESKWCipher final : public AESCipher {
public:
explicit AESKWCipher(ReadonlyBytes key);
ErrorOr<ByteBuffer> wrap(ReadonlyBytes) const;
ErrorOr<ByteBuffer> unwrap(ReadonlyBytes) const;
};
}