mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:37:46 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -24,20 +24,20 @@ constexpr void swap_keys(u32* keys, size_t i, size_t j)
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
DeprecatedString AESCipherBlock::to_deprecated_string() const
|
||||
ByteString AESCipherBlock::to_byte_string() const
|
||||
{
|
||||
StringBuilder builder;
|
||||
for (auto value : m_data)
|
||||
builder.appendff("{:02x}", value);
|
||||
return builder.to_deprecated_string();
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
|
||||
DeprecatedString AESCipherKey::to_deprecated_string() const
|
||||
ByteString AESCipherKey::to_byte_string() const
|
||||
{
|
||||
StringBuilder builder;
|
||||
for (size_t i = 0; i < (rounds() + 1) * 4; ++i)
|
||||
builder.appendff("{:02x}", m_rd_keys[i]);
|
||||
return builder.to_deprecated_string();
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <LibCrypto/Cipher/Mode/GCM.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <AK/DeprecatedString.h>
|
||||
# include <AK/ByteString.h>
|
||||
#endif
|
||||
|
||||
namespace Crypto::Cipher {
|
||||
|
@ -48,7 +48,7 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
DeprecatedString to_deprecated_string() const;
|
||||
ByteString to_byte_string() const;
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
@ -64,7 +64,7 @@ struct AESCipherKey : public CipherKey {
|
|||
static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; }
|
||||
|
||||
#ifndef KERNEL
|
||||
DeprecatedString to_deprecated_string() const;
|
||||
ByteString to_byte_string() const;
|
||||
#endif
|
||||
|
||||
u32 const* round_keys() const
|
||||
|
@ -120,7 +120,7 @@ public:
|
|||
virtual void decrypt_block(BlockType const& in, BlockType& out) override;
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const override
|
||||
virtual ByteString class_name() const override
|
||||
{
|
||||
return "AES";
|
||||
}
|
||||
|
|
|
@ -112,7 +112,7 @@ public:
|
|||
virtual void decrypt_block(BlockType const& in, BlockType& out) = 0;
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const = 0;
|
||||
virtual ByteString class_name() const = 0;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <LibCrypto/Cipher/Mode/Mode.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <AK/DeprecatedString.h>
|
||||
# include <AK/ByteString.h>
|
||||
#endif
|
||||
|
||||
namespace Crypto::Cipher {
|
||||
|
@ -29,12 +29,12 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const override
|
||||
virtual ByteString class_name() const override
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append(this->cipher().class_name());
|
||||
builder.append("_CBC"sv);
|
||||
return builder.to_deprecated_string();
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <LibCrypto/Cipher/Mode/Mode.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <AK/DeprecatedString.h>
|
||||
# include <AK/ByteString.h>
|
||||
#endif
|
||||
|
||||
namespace Crypto::Cipher {
|
||||
|
@ -104,12 +104,12 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const override
|
||||
virtual ByteString class_name() const override
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append(this->cipher().class_name());
|
||||
builder.append("_CTR"sv);
|
||||
return builder.to_deprecated_string();
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include <LibCrypto/Verification.h>
|
||||
|
||||
#ifndef KERNEL
|
||||
# include <AK/DeprecatedString.h>
|
||||
# include <AK/ByteString.h>
|
||||
#endif
|
||||
|
||||
namespace Crypto::Cipher {
|
||||
|
@ -44,12 +44,12 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const override
|
||||
virtual ByteString class_name() const override
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append(this->cipher().class_name());
|
||||
builder.append("_GCM"sv);
|
||||
return builder.to_deprecated_string();
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ public:
|
|||
}
|
||||
|
||||
#ifndef KERNEL
|
||||
virtual DeprecatedString class_name() const = 0;
|
||||
virtual ByteString class_name() const = 0;
|
||||
#endif
|
||||
|
||||
T& cipher()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue