From fc276946fb19cf13abc8b4d2542539cd50e556fe Mon Sep 17 00:00:00 2001 From: asynts Date: Sat, 15 Aug 2020 18:47:25 +0200 Subject: [PATCH] Refactor: Use ReadonlyBytes instead of const ReadonlyBytes&. --- Libraries/LibCrypto/Cipher/AES.cpp | 6 +++--- Libraries/LibCrypto/Cipher/AES.h | 4 ++-- Libraries/LibCrypto/Cipher/Cipher.h | 4 ++-- Userland/test-crypto.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/LibCrypto/Cipher/AES.cpp b/Libraries/LibCrypto/Cipher/AES.cpp index 919fa1e7f5..a6266fd1be 100644 --- a/Libraries/LibCrypto/Cipher/AES.cpp +++ b/Libraries/LibCrypto/Cipher/AES.cpp @@ -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); diff --git a/Libraries/LibCrypto/Cipher/AES.h b/Libraries/LibCrypto/Cipher/AES.h index 93a6d0b2d4..895f0f7e11 100644 --- a/Libraries/LibCrypto/Cipher/AES.h +++ b/Libraries/LibCrypto/Cipher/AES.h @@ -54,8 +54,8 @@ public: 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); } virtual void overwrite(const u8* data, size_t size) override { overwrite({ data, size }); } virtual void apply_initialization_vector(const u8* ivec) override diff --git a/Libraries/LibCrypto/Cipher/Cipher.h b/Libraries/LibCrypto/Cipher/Cipher.h index 5d95024ba5..c94b8b0b79 100644 --- a/Libraries/LibCrypto/Cipher/Cipher.h +++ b/Libraries/LibCrypto/Cipher/Cipher.h @@ -64,8 +64,8 @@ public: 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()); } + 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; diff --git a/Userland/test-crypto.cpp b/Userland/test-crypto.cpp index 972713329b..a95538ea7a 100644 --- a/Userland/test-crypto.cpp +++ b/Userland/test-crypto.cpp @@ -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) {