Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AK: Make some tweaks to AK::Span. #3166

Merged
merged 7 commits into from
Aug 15, 2020
Merged

AK: Make some tweaks to AK::Span. #3166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b2af2f
AK: Remove incorrect static assert in Span.h.
asynts Aug 15, 2020
6a2d81b
AK: Add bytes() method to FixedArray.
asynts Aug 12, 2020
4d3a8fa
AK: Add copy_to() and move_to() methods to AK::Span.
asynts Aug 12, 2020
901cb5b
AK: Add fill() method to Span.
asynts Aug 14, 2020
b0ff3d6
AK: Add slice() overload to Span.
asynts Aug 14, 2020
a706d24
AK: Rename span() to bytes() when appropriate.
asynts Aug 15, 2020
1289d51
Refactor: Use ReadonlyBytes instead of const ReadonlyBytes&.
asynts Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Libraries/LibCrypto/Cipher/AES.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,10 @@ void AESCipher::decrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
// clang-format on
}

void AESCipherBlock::overwrite(const ReadonlyBytes& span)
void AESCipherBlock::overwrite(ReadonlyBytes bytes)
{
auto data = span.data();
auto length = span.size();
auto data = bytes.data();
auto length = bytes.size();

ASSERT(length <= m_data.size());
m_data.overwrite(0, data, length);
Expand Down
4 changes: 2 additions & 2 deletions Libraries/LibCrypto/Cipher/AES.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ struct AESCipherBlock : public CipherBlock {
virtual ByteBuffer get() const override { return m_data; };
virtual const ByteBuffer& data() const override { return m_data; };

virtual void overwrite(const ReadonlyBytes&) override;
virtual void overwrite(const ByteBuffer& buffer) override { overwrite(buffer.bytes()); }
virtual void overwrite(ReadonlyBytes) override;
virtual void overwrite(const ByteBuffer& buffer) override { overwrite(buffer); }
asynts marked this conversation as resolved.
Show resolved Hide resolved
virtual void overwrite(const u8* data, size_t size) override { overwrite({ data, size }); }

virtual void apply_initialization_vector(const u8* ivec) override
Expand Down
4 changes: 2 additions & 2 deletions Libraries/LibCrypto/Cipher/Cipher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ struct CipherBlock {
virtual ByteBuffer get() const = 0;
virtual const ByteBuffer& data() const = 0;

virtual void overwrite(const ReadonlyBytes&) = 0;
virtual void overwrite(const ByteBuffer& buffer) { overwrite(buffer.bytes()); }
asynts marked this conversation as resolved.
Show resolved Hide resolved
virtual void overwrite(ReadonlyBytes) = 0;
virtual void overwrite(const ByteBuffer& buffer) { overwrite(buffer); }
virtual void overwrite(const u8* data, size_t size) { overwrite({ data, size }); }

virtual void apply_initialization_vector(const u8* ivec) = 0;
Expand Down
2 changes: 1 addition & 1 deletion Userland/test-crypto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static int crc32_tests();

// stop listing tests

static void print_buffer(const ReadonlyBytes& buffer, int split)
static void print_buffer(ReadonlyBytes buffer, int split)
{
for (size_t i = 0; i < buffer.size(); ++i) {
if (split > 0) {
Expand Down