summaryrefslogtreecommitdiff
path: root/Libraries/LibCrypto
diff options
context:
space:
mode:
Diffstat (limited to 'Libraries/LibCrypto')
-rw-r--r--Libraries/LibCrypto/Cipher/AES.h2
-rw-r--r--Libraries/LibCrypto/Cipher/Cipher.h3
-rw-r--r--Libraries/LibCrypto/Cipher/Mode/CBC.h178
-rw-r--r--Libraries/LibCrypto/PK/RSA.h2
4 files changed, 92 insertions, 93 deletions
diff --git a/Libraries/LibCrypto/Cipher/AES.h b/Libraries/LibCrypto/Cipher/AES.h
index af63a432f4..2786b674ee 100644
--- a/Libraries/LibCrypto/Cipher/AES.h
+++ b/Libraries/LibCrypto/Cipher/AES.h
@@ -89,7 +89,7 @@ struct AESCipherKey : public CipherKey {
expand_decrypt_key(user_key, key_bits);
}
- virtual ~AESCipherKey() override {}
+ virtual ~AESCipherKey() override { }
size_t rounds() const { return m_rounds; }
size_t length() const { return m_bits / 8; }
diff --git a/Libraries/LibCrypto/Cipher/Cipher.h b/Libraries/LibCrypto/Cipher/Cipher.h
index 767ebf7f63..f9d59b6b2b 100644
--- a/Libraries/LibCrypto/Cipher/Cipher.h
+++ b/Libraries/LibCrypto/Cipher/Cipher.h
@@ -39,7 +39,7 @@ enum class Intent {
};
enum class PaddingMode {
- CMS, // RFC 1423
+ CMS, // RFC 1423
RFC5246, // very similar to CMS, but filled with |length - 1|, instead of |length|
Null,
// FIXME: We do not implement these yet
@@ -137,4 +137,3 @@ private:
};
}
}
-
diff --git a/Libraries/LibCrypto/Cipher/Mode/CBC.h b/Libraries/LibCrypto/Cipher/Mode/CBC.h
index 8466de1fbb..45fb966f0b 100644
--- a/Libraries/LibCrypto/Cipher/Mode/CBC.h
+++ b/Libraries/LibCrypto/Cipher/Mode/CBC.h
@@ -33,100 +33,100 @@
namespace Crypto {
namespace Cipher {
- template <typename T>
- class CBC : public Mode<T> {
- public:
- constexpr static size_t IVSizeInBits = 128;
-
- virtual ~CBC() {}
- template <typename... Args>
- explicit constexpr CBC<T>(Args... args)
- : Mode<T>(args...)
- {
+template<typename T>
+class CBC : public Mode<T> {
+public:
+ constexpr static size_t IVSizeInBits = 128;
+
+ virtual ~CBC() { }
+ template<typename... Args>
+ explicit constexpr CBC<T>(Args... args)
+ : Mode<T>(args...)
+ {
+ }
+
+ virtual String class_name() const override
+ {
+ StringBuilder builder;
+ builder.append(this->cipher().class_name());
+ builder.append("_CBC");
+ return builder.build();
+ }
+
+ virtual size_t IV_length() const { return IVSizeInBits / 8; }
+
+ virtual Optional<ByteBuffer> encrypt(const ByteBuffer& in, ByteBuffer& out, Optional<ByteBuffer> ivec = {}) override
+ {
+ auto length = in.size();
+ if (length == 0)
+ return {};
+
+ auto& cipher = this->cipher();
+
+ // FIXME: We should have two of these encrypt/decrypt functions that
+ // we SFINAE out based on whether the Cipher mode needs an ivec
+ ASSERT(ivec.has_value());
+ const auto* iv = ivec.value().data();
+
+ typename T::BlockType block { cipher.padding_mode() };
+ size_t offset { 0 };
+ auto block_size = cipher.block_size();
+
+ while (length >= block_size) {
+ block.overwrite(in.slice_view(offset, block_size));
+ block.apply_initialization_vector(iv);
+ cipher.encrypt_block(block, block);
+ out.overwrite(offset, block.get().data(), block_size);
+ iv = out.offset_pointer(offset);
+ length -= block_size;
+ offset += block_size;
}
- virtual String class_name() const override
- {
- StringBuilder builder;
- builder.append(this->cipher().class_name());
- builder.append("_CBC");
- return builder.build();
+ if (length > 0) {
+ block.overwrite(in.slice_view(offset, length));
+ block.apply_initialization_vector(iv);
+ cipher.encrypt_block(block, block);
+ out.overwrite(offset, block.get().data(), block_size);
+ iv = out.offset_pointer(offset);
}
- virtual size_t IV_length() const { return IVSizeInBits / 8; }
-
- virtual Optional<ByteBuffer> encrypt(const ByteBuffer& in, ByteBuffer& out, Optional<ByteBuffer> ivec = {}) override
- {
- auto length = in.size();
- if (length == 0)
- return {};
-
- auto& cipher = this->cipher();
-
- // FIXME: We should have two of these encrypt/decrypt functions that
- // we SFINAE out based on whether the Cipher mode needs an ivec
- ASSERT(ivec.has_value());
- const auto* iv = ivec.value().data();
-
- typename T::BlockType block { cipher.padding_mode() };
- size_t offset { 0 };
- auto block_size = cipher.block_size();
-
- while (length >= block_size) {
- block.overwrite(in.slice_view(offset, block_size));
- block.apply_initialization_vector(iv);
- cipher.encrypt_block(block, block);
- out.overwrite(offset, block.get().data(), block_size);
- iv = out.offset_pointer(offset);
- length -= block_size;
- offset += block_size;
- }
-
- if (length > 0) {
- block.overwrite(in.slice_view(offset, length));
- block.apply_initialization_vector(iv);
- cipher.encrypt_block(block, block);
- out.overwrite(offset, block.get().data(), block_size);
- iv = out.offset_pointer(offset);
- }
-
- return ByteBuffer::copy(iv, block_size);
+ return ByteBuffer::copy(iv, block_size);
+ }
+ virtual void decrypt(const ByteBuffer& in, ByteBuffer& out, Optional<ByteBuffer> ivec = {}) override
+ {
+ auto length = in.size();
+ if (length == 0)
+ return;
+
+ auto& cipher = this->cipher();
+
+ ASSERT(ivec.has_value());
+ const auto* iv = ivec.value().data();
+
+ auto block_size = cipher.block_size();
+
+ // if the data is not aligned, it's not correct encrypted data
+ // FIXME (ponder): Should we simply decrypt as much as we can?
+ ASSERT(length % block_size == 0);
+
+ typename T::BlockType block { cipher.padding_mode() };
+ size_t offset { 0 };
+
+ while (length > 0) {
+ auto* slice = in.offset_pointer(offset);
+ block.overwrite(slice, block_size);
+ cipher.decrypt_block(block, block);
+ block.apply_initialization_vector(iv);
+ auto decrypted = block.get();
+ out.overwrite(offset, decrypted.data(), decrypted.size());
+ iv = slice;
+ length -= block_size;
+ offset += block_size;
}
- virtual void decrypt(const ByteBuffer& in, ByteBuffer& out, Optional<ByteBuffer> ivec = {}) override
- {
- auto length = in.size();
- if (length == 0)
- return;
-
- auto& cipher = this->cipher();
-
- ASSERT(ivec.has_value());
- const auto* iv = ivec.value().data();
-
- auto block_size = cipher.block_size();
-
- // if the data is not aligned, it's not correct encrypted data
- // FIXME (ponder): Should we simply decrypt as much as we can?
- ASSERT(length % block_size == 0);
-
- typename T::BlockType block { cipher.padding_mode() };
- size_t offset { 0 };
-
- while (length > 0) {
- auto* slice = in.offset_pointer(offset);
- block.overwrite(slice, block_size);
- cipher.decrypt_block(block, block);
- block.apply_initialization_vector(iv);
- auto decrypted = block.get();
- out.overwrite(offset, decrypted.data(), decrypted.size());
- iv = slice;
- length -= block_size;
- offset += block_size;
- }
- out.trim(offset);
- this->prune_padding(out);
- }
- };
+ out.trim(offset);
+ this->prune_padding(out);
+ }
+};
}
diff --git a/Libraries/LibCrypto/PK/RSA.h b/Libraries/LibCrypto/PK/RSA.h
index 4c50f36e41..a4f758efbc 100644
--- a/Libraries/LibCrypto/PK/RSA.h
+++ b/Libraries/LibCrypto/PK/RSA.h
@@ -219,7 +219,7 @@ public:
{
}
- ~RSA_PKCS1_EME() {}
+ ~RSA_PKCS1_EME() { }
virtual void encrypt(const ByteBuffer& in, ByteBuffer& out) override;
virtual void decrypt(const ByteBuffer& in, ByteBuffer& out) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:18:29 +0000