RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:17:35 +00:00
Code Issues Activity Actions

LibCrypto: Reduce use of ByteBuffer in AES code

Browse source 
Use Bytes/ReadonlyBytes more where possible.
This commit is contained in:
Andreas Kling 2021-01-12 09:25:55 +01:00
parent e6f907a155
commit 52b05a08c7
6 changed files with 31 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Libraries/LibCrypto/Cipher/AES.cpp
View file

@ -222,10 +222,10 @@ void AESCipher::encrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
const auto& dec_key = key(); const auto& dec_key = key();
const auto* round_keys = dec_key.round_keys(); const auto* round_keys = dec_key.round_keys();
s0 = get_key(in.data().offset_pointer(0)) ^ round_keys[0]; s0 = get_key(in.bytes().offset_pointer(0)) ^ round_keys[0];
s1 = get_key(in.data().offset_pointer(4)) ^ round_keys[1]; s1 = get_key(in.bytes().offset_pointer(4)) ^ round_keys[1];
s2 = get_key(in.data().offset_pointer(8)) ^ round_keys[2]; s2 = get_key(in.bytes().offset_pointer(8)) ^ round_keys[2];
s3 = get_key(in.data().offset_pointer(12)) ^ round_keys[3]; s3 = get_key(in.bytes().offset_pointer(12)) ^ round_keys[3];
r = dec_key.rounds() >> 1; r = dec_key.rounds() >> 1;
@ -315,10 +315,10 @@ void AESCipher::decrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
const auto& dec_key = key(); const auto& dec_key = key();
const auto* round_keys = dec_key.round_keys(); const auto* round_keys = dec_key.round_keys();
s0 = get_key(in.data().offset_pointer(0)) ^ round_keys[0]; s0 = get_key(in.bytes().offset_pointer(0)) ^ round_keys[0];
s1 = get_key(in.data().offset_pointer(4)) ^ round_keys[1]; s1 = get_key(in.bytes().offset_pointer(4)) ^ round_keys[1];
s2 = get_key(in.data().offset_pointer(8)) ^ round_keys[2]; s2 = get_key(in.bytes().offset_pointer(8)) ^ round_keys[2];
s3 = get_key(in.data().offset_pointer(12)) ^ round_keys[3]; s3 = get_key(in.bytes().offset_pointer(12)) ^ round_keys[3];
r = dec_key.rounds() >> 1; r = dec_key.rounds() >> 1;
@ -401,21 +401,21 @@ void AESCipherBlock::overwrite(ReadonlyBytes bytes)
auto data = bytes.data(); auto data = bytes.data();
auto length = bytes.size(); auto length = bytes.size();
ASSERT(length <= m_data.size()); ASSERT(length <= this->data_size());
m_data.overwrite(0, data, length); this->bytes().overwrite(0, data, length);
if (length < m_data.size()) { if (length < this->data_size()) {
switch (padding_mode()) { switch (padding_mode()) {
case PaddingMode::Null: case PaddingMode::Null:
// fill with zeros // fill with zeros
__builtin_memset(m_data.data() + length, 0, m_data.size() - length); __builtin_memset(m_data + length, 0, this->data_size() - length);
break; break;
case PaddingMode::CMS: case PaddingMode::CMS:
// fill with the length of the padding bytes // fill with the length of the padding bytes
__builtin_memset(m_data.data() + length, m_data.size() - length, m_data.size() - length); __builtin_memset(m_data + length, this->data_size() - length, this->data_size() - length);
break; break;
case PaddingMode::RFC5246: case PaddingMode::RFC5246:
// fill with the length of the padding bytes minus one // fill with the length of the padding bytes minus one
__builtin_memset(m_data.data() + length, m_data.size() - length - 1, m_data.size() - length); __builtin_memset(m_data + length, this->data_size() - length - 1, this->data_size() - length);
break; break;
default: default:
// FIXME: We should handle the rest of the common padding modes // FIXME: We should handle the rest of the common padding modes

14
Libraries/LibCrypto/Cipher/AES.h
View file

@ -42,7 +42,6 @@ public:
explicit AESCipherBlock(PaddingMode mode = PaddingMode::CMS) explicit AESCipherBlock(PaddingMode mode = PaddingMode::CMS)
: CipherBlock(mode) : CipherBlock(mode)
{ {
m_data = ByteBuffer::create_zeroed(BlockSizeInBits / 8);
} }
AESCipherBlock(const u8* data, size_t length, PaddingMode mode = PaddingMode::CMS) AESCipherBlock(const u8* data, size_t length, PaddingMode mode = PaddingMode::CMS)
: AESCipherBlock(mode) : AESCipherBlock(mode)
@ -52,12 +51,10 @@ public:
static size_t block_size() { return BlockSizeInBits / 8; }; static size_t block_size() { return BlockSizeInBits / 8; };
virtual ByteBuffer get() const override { return m_data; }; virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_data, sizeof(m_data) }; }
virtual const ByteBuffer& data() const override { return m_data; }; virtual Bytes bytes() override { return Bytes { m_data, sizeof(m_data) }; }
ReadonlyBytes bytes() const { return m_data; }
virtual void overwrite(ReadonlyBytes) override; virtual void overwrite(ReadonlyBytes) override;
virtual void overwrite(const ByteBuffer& buffer) override { overwrite(buffer.bytes()); }
virtual void overwrite(const u8* data, size_t size) override { overwrite({ data, size }); } virtual void overwrite(const u8* data, size_t size) override { overwrite({ data, size }); }
virtual void apply_initialization_vector(const u8* ivec) override virtual void apply_initialization_vector(const u8* ivec) override
@ -69,12 +66,13 @@ public:
String to_string() const; String to_string() const;
private: private:
virtual ByteBuffer& data() override { return m_data; }; size_t data_size() const { return sizeof(m_data); }
ByteBuffer m_data;
u8 m_data[BlockSizeInBits / 8] {};
}; };
struct AESCipherKey : public CipherKey { struct AESCipherKey : public CipherKey {
virtual ByteBuffer data() const override { return ByteBuffer::copy(m_rd_keys, sizeof(m_rd_keys)); }; 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_encrypt_key(ReadonlyBytes user_key, size_t bits) override;
virtual void expand_decrypt_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; }; static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; };

14
Libraries/LibCrypto/Cipher/Cipher.h
View file

@ -26,8 +26,8 @@
#pragma once #pragma once
#include <AK/ByteBuffer.h>
#include <AK/Optional.h> #include <AK/Optional.h>
#include <AK/Span.h>
#include <AK/Types.h> #include <AK/Types.h>
namespace Crypto { namespace Crypto {
@ -61,11 +61,9 @@ public:
static size_t block_size() { ASSERT_NOT_REACHED(); } static size_t block_size() { ASSERT_NOT_REACHED(); }
virtual ByteBuffer get() const = 0; virtual ReadonlyBytes bytes() const = 0;
virtual const ByteBuffer& data() const = 0;
virtual void overwrite(ReadonlyBytes) = 0; virtual void overwrite(ReadonlyBytes) = 0;
virtual void overwrite(const ByteBuffer& buffer) { overwrite(buffer.bytes()); }
virtual void overwrite(const u8* data, size_t size) { overwrite({ data, size }); } virtual void overwrite(const u8* data, size_t size) { overwrite({ data, size }); }
virtual void apply_initialization_vector(const u8* ivec) = 0; virtual void apply_initialization_vector(const u8* ivec) = 0;
@ -76,8 +74,8 @@ public:
template<typename T> template<typename T>
void put(size_t offset, T value) void put(size_t offset, T value)
{ {
ASSERT(offset + sizeof(T) <= data().size()); ASSERT(offset + sizeof(T) <= bytes().size());
auto* ptr = data().data() + offset; auto* ptr = bytes().offset_pointer(offset);
auto index { 0 }; auto index { 0 };
ASSERT(sizeof(T) <= 4); ASSERT(sizeof(T) <= 4);
@ -95,12 +93,12 @@ public:
} }
private: private:
virtual ByteBuffer& data() = 0; virtual Bytes bytes() = 0;
PaddingMode m_padding_mode; PaddingMode m_padding_mode;
}; };
struct CipherKey { struct CipherKey {
virtual ByteBuffer data() const = 0; virtual ReadonlyBytes bytes() const = 0;
static bool is_valid_key_size(size_t) { return false; }; static bool is_valid_key_size(size_t) { return false; };
virtual ~CipherKey() { } virtual ~CipherKey() { }

6
Libraries/LibCrypto/Cipher/Mode/CBC.h
View file

@ -78,7 +78,7 @@ public:
m_cipher_block.apply_initialization_vector(iv); m_cipher_block.apply_initialization_vector(iv);
cipher.encrypt_block(m_cipher_block, m_cipher_block); cipher.encrypt_block(m_cipher_block, m_cipher_block);
ASSERT(offset + block_size <= out.size()); ASSERT(offset + block_size <= out.size());
__builtin_memcpy(out.offset(offset), m_cipher_block.get().data(), block_size); __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), block_size);
iv = out.offset(offset); iv = out.offset(offset);
length -= block_size; length -= block_size;
offset += block_size; offset += block_size;
@ -89,7 +89,7 @@ public:
m_cipher_block.apply_initialization_vector(iv); m_cipher_block.apply_initialization_vector(iv);
cipher.encrypt_block(m_cipher_block, m_cipher_block); cipher.encrypt_block(m_cipher_block, m_cipher_block);
ASSERT(offset + block_size <= out.size()); ASSERT(offset + block_size <= out.size());
__builtin_memcpy(out.offset(offset), m_cipher_block.get().data(), block_size); __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), block_size);
iv = out.offset(offset); iv = out.offset(offset);
} }
@ -122,7 +122,7 @@ public:
m_cipher_block.overwrite(slice, block_size); m_cipher_block.overwrite(slice, block_size);
cipher.decrypt_block(m_cipher_block, m_cipher_block); cipher.decrypt_block(m_cipher_block, m_cipher_block);
m_cipher_block.apply_initialization_vector(iv); m_cipher_block.apply_initialization_vector(iv);
auto decrypted = m_cipher_block.get(); auto decrypted = m_cipher_block.bytes();
ASSERT(offset + decrypted.size() <= out.size()); ASSERT(offset + decrypted.size() <= out.size());
__builtin_memcpy(out.offset(offset), decrypted.data(), decrypted.size()); __builtin_memcpy(out.offset(offset), decrypted.data(), decrypted.size());
iv = slice; iv = slice;

2
Libraries/LibCrypto/Cipher/Mode/CTR.h
View file

@ -193,7 +193,7 @@ protected:
auto write_size = min(block_size, length); auto write_size = min(block_size, length);
ASSERT(offset + write_size <= out.size()); ASSERT(offset + write_size <= out.size());
__builtin_memcpy(out.offset(offset), m_cipher_block.get().data(), write_size); __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), write_size);
increment(iv); increment(iv);
length -= write_size; length -= write_size;

2
Libraries/LibCrypto/Cipher/Mode/GCM.h
View file

@ -105,7 +105,7 @@ public:
auto auth_tag = m_ghash->process(aad, out); auto auth_tag = m_ghash->process(aad, out);
block0.apply_initialization_vector(auth_tag.data); block0.apply_initialization_vector(auth_tag.data);
block0.get().bytes().copy_to(tag); block0.bytes().copy_to(tag);
} }
VerificationConsistency decrypt(ReadonlyBytes in, Bytes out, ReadonlyBytes iv_in, ReadonlyBytes aad, ReadonlyBytes tag) VerificationConsistency decrypt(ReadonlyBytes in, Bytes out, ReadonlyBytes iv_in, ReadonlyBytes aad, ReadonlyBytes tag)