From e76956f7123e5ba9155dd6e48aad8bdac379c54b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 7 May 2021 11:42:33 +0200 Subject: [PATCH] LibCrypto: Convert StringBuilder::appendf() => AK::Format --- Userland/Libraries/LibCrypto/Cipher/AES.cpp | 6 +++--- Userland/Libraries/LibCrypto/Hash/SHA2.h | 16 ++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Userland/Libraries/LibCrypto/Cipher/AES.cpp b/Userland/Libraries/LibCrypto/Cipher/AES.cpp index 796e4f9fa4..83963de8d2 100644 --- a/Userland/Libraries/LibCrypto/Cipher/AES.cpp +++ b/Userland/Libraries/LibCrypto/Cipher/AES.cpp @@ -26,8 +26,8 @@ constexpr void swap_keys(u32* keys, size_t i, size_t j) String AESCipherBlock::to_string() const { StringBuilder builder; - for (size_t i = 0; i < BlockSizeInBits / 8; ++i) - builder.appendf("%02x", m_data[i]); + for (auto value : m_data) + builder.appendff("{:02x}", value); return builder.build(); } @@ -35,7 +35,7 @@ String AESCipherKey::to_string() const { StringBuilder builder; for (size_t i = 0; i < (rounds() + 1) * 4; ++i) - builder.appendf("%02x", m_rd_keys[i]); + builder.appendff("{:02x}", m_rd_keys[i]); return builder.build(); } diff --git a/Userland/Libraries/LibCrypto/Hash/SHA2.h b/Userland/Libraries/LibCrypto/Hash/SHA2.h index 1eb51c4423..e9b63ef7d5 100644 --- a/Userland/Libraries/LibCrypto/Hash/SHA2.h +++ b/Userland/Libraries/LibCrypto/Hash/SHA2.h @@ -100,11 +100,9 @@ public: virtual String class_name() const override { - StringBuilder builder; - builder.append("SHA"); - builder.appendf("%zu", this->DigestSize * 8); - return builder.build(); - }; + return String::formatted("SHA{}", DigestSize * 8); + } + inline virtual void reset() override { m_data_length = 0; @@ -152,11 +150,9 @@ public: virtual String class_name() const override { - StringBuilder builder; - builder.append("SHA"); - builder.appendf("%zu", this->DigestSize * 8); - return builder.build(); - }; + return String::formatted("SHA{%zu}", DigestSize * 8); + } + inline virtual void reset() override { m_data_length = 0;