diff --git a/Libraries/LibCrypto/CMakeLists.txt b/Libraries/LibCrypto/CMakeLists.txt index 257e1619c31..fb2f11215df 100644 --- a/Libraries/LibCrypto/CMakeLists.txt +++ b/Libraries/LibCrypto/CMakeLists.txt @@ -22,7 +22,6 @@ set(SOURCES Checksum/cksum.cpp Checksum/CRC32.cpp Cipher/AES.cpp - Cipher/Cipher.cpp Curves/EdwardsCurve.cpp Curves/SECPxxxr1.cpp Hash/BLAKE2b.cpp diff --git a/Libraries/LibCrypto/Cipher/AES.cpp b/Libraries/LibCrypto/Cipher/AES.cpp index b3b8a2dfb3d..6a6ce155f07 100644 --- a/Libraries/LibCrypto/Cipher/AES.cpp +++ b/Libraries/LibCrypto/Cipher/AES.cpp @@ -1,404 +1,214 @@ /* * Copyright (c) 2020, Ali Mohammad Pur + * Copyright (c) 2025, Altomani Gianluca * * SPDX-License-Identifier: BSD-2-Clause */ -#include #include -#include +#include + +#include namespace Crypto::Cipher { -template -constexpr u32 get_key(T pt) +#define GET_CIPHER(key, mode) \ + [&key] { \ + switch (key.size()) { \ + case 16: \ + return EVP_aes_128_##mode(); \ + case 24: \ + return EVP_aes_192_##mode(); \ + case 32: \ + return EVP_aes_256_##mode(); \ + default: \ + VERIFY_NOT_REACHED(); \ + } \ + }() + +size_t AESCipher::block_size() const { - return ((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]); + auto size = EVP_CIPHER_get_block_size(m_cipher); + VERIFY(size != 0); + return size; } -constexpr void swap_keys(u32* keys, size_t i, size_t j) +AESCBCCipher::AESCBCCipher(ReadonlyBytes key, bool no_padding) + : AESCipher(GET_CIPHER(key, cbc), key) + , m_no_padding(no_padding) { - u32 temp = keys[i]; - keys[i] = keys[j]; - keys[j] = temp; } -ByteString AESCipherBlock::to_byte_string() const +ErrorOr AESCBCCipher::encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const { - StringBuilder builder; - for (auto value : m_data) - builder.appendff("{:02x}", value); - return builder.to_byte_string(); + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); + + OPENSSL_TRY(EVP_EncryptInit(ctx.ptr(), m_cipher, m_key.data(), iv.data())); + OPENSSL_TRY(EVP_CIPHER_CTX_set_padding(ctx.ptr(), m_no_padding ? 0 : 1)); + + auto out = TRY(ByteBuffer::create_uninitialized(plaintext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_EncryptUpdate(ctx.ptr(), out.data(), &out_size, plaintext.data(), plaintext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_EncryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); } -ByteString AESCipherKey::to_byte_string() const +ErrorOr AESCBCCipher::decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const { - StringBuilder builder; - for (size_t i = 0; i < (rounds() + 1) * 4; ++i) - builder.appendff("{:02x}", m_rd_keys[i]); - return builder.to_byte_string(); + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); + + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), m_cipher, m_key.data(), iv.data())); + OPENSSL_TRY(EVP_CIPHER_CTX_set_padding(ctx.ptr(), m_no_padding ? 0 : 1)); + + auto out = TRY(ByteBuffer::create_uninitialized(ciphertext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_DecryptUpdate(ctx.ptr(), out.data(), &out_size, ciphertext.data(), ciphertext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_DecryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); } -void AESCipherKey::expand_encrypt_key(ReadonlyBytes user_key, size_t bits) +AESCTRCipher::AESCTRCipher(ReadonlyBytes key) + : AESCipher(GET_CIPHER(key, ctr), key) { - u32* round_key; - u32 temp; - size_t i { 0 }; +} - VERIFY(!user_key.is_null()); - VERIFY(is_valid_key_size(bits)); - VERIFY(user_key.size() == bits / 8); +ErrorOr AESCTRCipher::encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const +{ + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); - round_key = round_keys(); + OPENSSL_TRY(EVP_EncryptInit(ctx.ptr(), m_cipher, m_key.data(), iv.data())); - if (bits == 128) { - m_rounds = 10; - } else if (bits == 192) { - m_rounds = 12; - } else { - m_rounds = 14; + auto out = TRY(ByteBuffer::create_uninitialized(plaintext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_EncryptUpdate(ctx.ptr(), out.data(), &out_size, plaintext.data(), plaintext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_EncryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); +} + +ErrorOr AESCTRCipher::decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const +{ + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); + + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), m_cipher, m_key.data(), iv.data())); + + auto out = TRY(ByteBuffer::create_uninitialized(ciphertext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_DecryptUpdate(ctx.ptr(), out.data(), &out_size, ciphertext.data(), ciphertext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_DecryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); +} + +AESGCMCipher::AESGCMCipher(ReadonlyBytes key) + : AESCipher(GET_CIPHER(key, gcm), key) +{ +} + +ErrorOr AESGCMCipher::encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv, ReadonlyBytes aad, size_t taglen) const +{ + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); + + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), m_cipher, nullptr, nullptr)); + OPENSSL_TRY(EVP_CIPHER_CTX_ctrl(ctx.ptr(), EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)); + + OPENSSL_TRY(EVP_EncryptInit(ctx.ptr(), nullptr, m_key.data(), iv.data())); + + // To specify additional authenticated data (AAD), a call to EVP_CipherUpdate(), EVP_EncryptUpdate() or EVP_DecryptUpdate() should be made + // with the output parameter out set to NULL. + if (!aad.is_empty()) { + int aad_size = 0; + OPENSSL_TRY(EVP_EncryptUpdate(ctx.ptr(), nullptr, &aad_size, aad.data(), aad.size())); } - round_key[0] = get_key(user_key.data()); - round_key[1] = get_key(user_key.data() + 4); - round_key[2] = get_key(user_key.data() + 8); - round_key[3] = get_key(user_key.data() + 12); - if (bits == 128) { - for (;;) { - temp = round_key[3]; - // clang-format off - round_key[4] = round_key[0] ^ - (AESTables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^ - (AESTables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(temp >> 24) ] & 0x000000ff) ^ AESTables::RCON[i]; - // clang-format on - round_key[5] = round_key[1] ^ round_key[4]; - round_key[6] = round_key[2] ^ round_key[5]; - round_key[7] = round_key[3] ^ round_key[6]; - ++i; - if (i == 10) - break; - round_key += 4; - } - return; - } + auto out = TRY(ByteBuffer::create_uninitialized(plaintext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_EncryptUpdate(ctx.ptr(), out.data(), &out_size, plaintext.data(), plaintext.size())); - round_key[4] = get_key(user_key.data() + 16); - round_key[5] = get_key(user_key.data() + 20); - if (bits == 192) { - for (;;) { - temp = round_key[5]; - // clang-format off - round_key[6] = round_key[0] ^ - (AESTables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^ - (AESTables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(temp >> 24) ] & 0x000000ff) ^ AESTables::RCON[i]; - // clang-format on - round_key[7] = round_key[1] ^ round_key[6]; - round_key[8] = round_key[2] ^ round_key[7]; - round_key[9] = round_key[3] ^ round_key[8]; + int final_size = 0; + OPENSSL_TRY(EVP_EncryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); - ++i; - if (i == 8) - break; + auto tag = TRY(ByteBuffer::create_uninitialized(taglen)); + OPENSSL_TRY(EVP_CIPHER_CTX_ctrl(ctx.ptr(), EVP_CTRL_GCM_GET_TAG, taglen, tag.data())); - round_key[10] = round_key[4] ^ round_key[9]; - round_key[11] = round_key[5] ^ round_key[10]; - - round_key += 6; - } - return; - } - - round_key[6] = get_key(user_key.data() + 24); - round_key[7] = get_key(user_key.data() + 28); - if (true) { // bits == 256 - for (;;) { - temp = round_key[7]; - // clang-format off - round_key[8] = round_key[0] ^ - (AESTables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^ - (AESTables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(temp >> 24) ] & 0x000000ff) ^ AESTables::RCON[i]; - // clang-format on - round_key[9] = round_key[1] ^ round_key[8]; - round_key[10] = round_key[2] ^ round_key[9]; - round_key[11] = round_key[3] ^ round_key[10]; - - ++i; - if (i == 7) - break; - - temp = round_key[11]; - // clang-format off - round_key[12] = round_key[4] ^ - (AESTables::Encode2[(temp >> 24) ] & 0xff000000) ^ - (AESTables::Encode3[(temp >> 16) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(temp >> 8) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(temp ) & 0xff] & 0x000000ff) ; - // clang-format on - round_key[13] = round_key[5] ^ round_key[12]; - round_key[14] = round_key[6] ^ round_key[13]; - round_key[15] = round_key[7] ^ round_key[14]; - - round_key += 8; - } - return; - } + return EncryptedData { + .ciphertext = TRY(out.slice(0, out_size + final_size)), + .tag = tag + }; } -void AESCipherKey::expand_decrypt_key(ReadonlyBytes user_key, size_t bits) +ErrorOr AESGCMCipher::decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv, ReadonlyBytes aad, ReadonlyBytes tag) const { - u32* round_key; + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); - expand_encrypt_key(user_key, bits); + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), m_cipher, nullptr, nullptr)); + OPENSSL_TRY(EVP_CIPHER_CTX_ctrl(ctx.ptr(), EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)); - round_key = round_keys(); + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), nullptr, m_key.data(), iv.data())); + OPENSSL_TRY(EVP_CIPHER_CTX_ctrl(ctx.ptr(), EVP_CTRL_GCM_SET_TAG, tag.size(), const_cast(tag.data()))); - // reorder round keys - for (size_t i = 0, j = 4 * rounds(); i < j; i += 4, j -= 4) { - swap_keys(round_key, i, j); - swap_keys(round_key, i + 1, j + 1); - swap_keys(round_key, i + 2, j + 2); - swap_keys(round_key, i + 3, j + 3); + // To specify additional authenticated data (AAD), a call to EVP_CipherUpdate(), EVP_EncryptUpdate() or EVP_DecryptUpdate() should be made + // with the output parameter out set to NULL. + if (!aad.is_empty()) { + int aad_size = 0; + OPENSSL_TRY(EVP_DecryptUpdate(ctx.ptr(), nullptr, &aad_size, aad.data(), aad.size())); } - // apply inverse mix-column to middle rounds - for (size_t i = 1; i < rounds(); ++i) { - round_key += 4; - // clang-format off - round_key[0] = - AESTables::Decode0[AESTables::Encode1[(round_key[0] >> 24) ] & 0xff] ^ - AESTables::Decode1[AESTables::Encode1[(round_key[0] >> 16) & 0xff] & 0xff] ^ - AESTables::Decode2[AESTables::Encode1[(round_key[0] >> 8) & 0xff] & 0xff] ^ - AESTables::Decode3[AESTables::Encode1[(round_key[0] ) & 0xff] & 0xff] ; - round_key[1] = - AESTables::Decode0[AESTables::Encode1[(round_key[1] >> 24) ] & 0xff] ^ - AESTables::Decode1[AESTables::Encode1[(round_key[1] >> 16) & 0xff] & 0xff] ^ - AESTables::Decode2[AESTables::Encode1[(round_key[1] >> 8) & 0xff] & 0xff] ^ - AESTables::Decode3[AESTables::Encode1[(round_key[1] ) & 0xff] & 0xff] ; - round_key[2] = - AESTables::Decode0[AESTables::Encode1[(round_key[2] >> 24) ] & 0xff] ^ - AESTables::Decode1[AESTables::Encode1[(round_key[2] >> 16) & 0xff] & 0xff] ^ - AESTables::Decode2[AESTables::Encode1[(round_key[2] >> 8) & 0xff] & 0xff] ^ - AESTables::Decode3[AESTables::Encode1[(round_key[2] ) & 0xff] & 0xff] ; - round_key[3] = - AESTables::Decode0[AESTables::Encode1[(round_key[3] >> 24) ] & 0xff] ^ - AESTables::Decode1[AESTables::Encode1[(round_key[3] >> 16) & 0xff] & 0xff] ^ - AESTables::Decode2[AESTables::Encode1[(round_key[3] >> 8) & 0xff] & 0xff] ^ - AESTables::Decode3[AESTables::Encode1[(round_key[3] ) & 0xff] & 0xff] ; - // clang-format on - } + auto out = TRY(ByteBuffer::create_uninitialized(ciphertext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_DecryptUpdate(ctx.ptr(), out.data(), &out_size, ciphertext.data(), ciphertext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_DecryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); } -void AESCipher::encrypt_block(AESCipherBlock const& in, AESCipherBlock& out) +AESKWCipher::AESKWCipher(ReadonlyBytes key) + : AESCipher(GET_CIPHER(key, wrap), key) { - u32 s0, s1, s2, s3, t0, t1, t2, t3; - size_t r { 0 }; - - auto const& dec_key = key(); - auto const* round_keys = dec_key.round_keys(); - - s0 = get_key(in.bytes().offset_pointer(0)) ^ round_keys[0]; - s1 = get_key(in.bytes().offset_pointer(4)) ^ round_keys[1]; - s2 = get_key(in.bytes().offset_pointer(8)) ^ round_keys[2]; - s3 = get_key(in.bytes().offset_pointer(12)) ^ round_keys[3]; - - r = dec_key.rounds() >> 1; - - // apply the first |r - 1| rounds - for (;;) { - // clang-format off - t0 = AESTables::Encode0[(s0 >> 24) ] ^ - AESTables::Encode1[(s1 >> 16) & 0xff] ^ - AESTables::Encode2[(s2 >> 8) & 0xff] ^ - AESTables::Encode3[(s3 ) & 0xff] ^ round_keys[4]; - t1 = AESTables::Encode0[(s1 >> 24) ] ^ - AESTables::Encode1[(s2 >> 16) & 0xff] ^ - AESTables::Encode2[(s3 >> 8) & 0xff] ^ - AESTables::Encode3[(s0 ) & 0xff] ^ round_keys[5]; - t2 = AESTables::Encode0[(s2 >> 24) ] ^ - AESTables::Encode1[(s3 >> 16) & 0xff] ^ - AESTables::Encode2[(s0 >> 8) & 0xff] ^ - AESTables::Encode3[(s1 ) & 0xff] ^ round_keys[6]; - t3 = AESTables::Encode0[(s3 >> 24) ] ^ - AESTables::Encode1[(s0 >> 16) & 0xff] ^ - AESTables::Encode2[(s1 >> 8) & 0xff] ^ - AESTables::Encode3[(s2 ) & 0xff] ^ round_keys[7]; - // clang-format on - - round_keys += 8; - --r; - if (r == 0) - break; - - // clang-format off - s0 = AESTables::Encode0[(t0 >> 24) ] ^ - AESTables::Encode1[(t1 >> 16) & 0xff] ^ - AESTables::Encode2[(t2 >> 8) & 0xff] ^ - AESTables::Encode3[(t3 ) & 0xff] ^ round_keys[0]; - s1 = AESTables::Encode0[(t1 >> 24) ] ^ - AESTables::Encode1[(t2 >> 16) & 0xff] ^ - AESTables::Encode2[(t3 >> 8) & 0xff] ^ - AESTables::Encode3[(t0 ) & 0xff] ^ round_keys[1]; - s2 = AESTables::Encode0[(t2 >> 24) ] ^ - AESTables::Encode1[(t3 >> 16) & 0xff] ^ - AESTables::Encode2[(t0 >> 8) & 0xff] ^ - AESTables::Encode3[(t1 ) & 0xff] ^ round_keys[2]; - s3 = AESTables::Encode0[(t3 >> 24) ] ^ - AESTables::Encode1[(t0 >> 16) & 0xff] ^ - AESTables::Encode2[(t1 >> 8) & 0xff] ^ - AESTables::Encode3[(t2 ) & 0xff] ^ round_keys[3]; - // clang-format on - } - - // apply the last round and put the encrypted data into out - // clang-format off - s0 = (AESTables::Encode2[(t0 >> 24) ] & 0xff000000) ^ - (AESTables::Encode3[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(t3 ) & 0xff] & 0x000000ff) ^ round_keys[0]; - out.put(0, s0); - - s1 = (AESTables::Encode2[(t1 >> 24) ] & 0xff000000) ^ - (AESTables::Encode3[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(t0 ) & 0xff] & 0x000000ff) ^ round_keys[1]; - out.put(4, s1); - - s2 = (AESTables::Encode2[(t2 >> 24) ] & 0xff000000) ^ - (AESTables::Encode3[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(t1 ) & 0xff] & 0x000000ff) ^ round_keys[2]; - out.put(8, s2); - - s3 = (AESTables::Encode2[(t3 >> 24) ] & 0xff000000) ^ - (AESTables::Encode3[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (AESTables::Encode0[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (AESTables::Encode1[(t2 ) & 0xff] & 0x000000ff) ^ round_keys[3]; - out.put(12, s3); - // clang-format on } -void AESCipher::decrypt_block(AESCipherBlock const& in, AESCipherBlock& out) +ErrorOr AESKWCipher::wrap(ReadonlyBytes plaintext) const { - u32 s0, s1, s2, s3, t0, t1, t2, t3; - size_t r { 0 }; + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); - auto const& dec_key = key(); - auto const* round_keys = dec_key.round_keys(); + OPENSSL_TRY(EVP_EncryptInit(ctx.ptr(), m_cipher, m_key.data(), nullptr)); - s0 = get_key(in.bytes().offset_pointer(0)) ^ round_keys[0]; - s1 = get_key(in.bytes().offset_pointer(4)) ^ round_keys[1]; - s2 = get_key(in.bytes().offset_pointer(8)) ^ round_keys[2]; - s3 = get_key(in.bytes().offset_pointer(12)) ^ round_keys[3]; + auto out = TRY(ByteBuffer::create_uninitialized(plaintext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_EncryptUpdate(ctx.ptr(), out.data(), &out_size, plaintext.data(), plaintext.size())); - r = dec_key.rounds() >> 1; + int final_size = 0; + OPENSSL_TRY(EVP_EncryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); - // apply the first |r - 1| rounds - for (;;) { - // clang-format off - t0 = AESTables::Decode0[(s0 >> 24) ] ^ - AESTables::Decode1[(s3 >> 16) & 0xff] ^ - AESTables::Decode2[(s2 >> 8) & 0xff] ^ - AESTables::Decode3[(s1 ) & 0xff] ^ round_keys[4]; - t1 = AESTables::Decode0[(s1 >> 24) ] ^ - AESTables::Decode1[(s0 >> 16) & 0xff] ^ - AESTables::Decode2[(s3 >> 8) & 0xff] ^ - AESTables::Decode3[(s2 ) & 0xff] ^ round_keys[5]; - t2 = AESTables::Decode0[(s2 >> 24) ] ^ - AESTables::Decode1[(s1 >> 16) & 0xff] ^ - AESTables::Decode2[(s0 >> 8) & 0xff] ^ - AESTables::Decode3[(s3 ) & 0xff] ^ round_keys[6]; - t3 = AESTables::Decode0[(s3 >> 24) ] ^ - AESTables::Decode1[(s2 >> 16) & 0xff] ^ - AESTables::Decode2[(s1 >> 8) & 0xff] ^ - AESTables::Decode3[(s0 ) & 0xff] ^ round_keys[7]; - // clang-format on - - round_keys += 8; - --r; - if (r == 0) - break; - - // clang-format off - s0 = AESTables::Decode0[(t0 >> 24) ] ^ - AESTables::Decode1[(t3 >> 16) & 0xff] ^ - AESTables::Decode2[(t2 >> 8) & 0xff] ^ - AESTables::Decode3[(t1 ) & 0xff] ^ round_keys[0]; - s1 = AESTables::Decode0[(t1 >> 24) ] ^ - AESTables::Decode1[(t0 >> 16) & 0xff] ^ - AESTables::Decode2[(t3 >> 8) & 0xff] ^ - AESTables::Decode3[(t2 ) & 0xff] ^ round_keys[1]; - s2 = AESTables::Decode0[(t2 >> 24) ] ^ - AESTables::Decode1[(t1 >> 16) & 0xff] ^ - AESTables::Decode2[(t0 >> 8) & 0xff] ^ - AESTables::Decode3[(t3 ) & 0xff] ^ round_keys[2]; - s3 = AESTables::Decode0[(t3 >> 24) ] ^ - AESTables::Decode1[(t2 >> 16) & 0xff] ^ - AESTables::Decode2[(t1 >> 8) & 0xff] ^ - AESTables::Decode3[(t0 ) & 0xff] ^ round_keys[3]; - // clang-format on - } - - // apply the last round and put the decrypted data into out - // clang-format off - s0 = ((u32)AESTables::Decode4[(t0 >> 24) ] << 24) ^ - ((u32)AESTables::Decode4[(t3 >> 16) & 0xff] << 16) ^ - ((u32)AESTables::Decode4[(t2 >> 8) & 0xff] << 8) ^ - ((u32)AESTables::Decode4[(t1 ) & 0xff] ) ^ round_keys[0]; - out.put(0, s0); - - s1 = ((u32)AESTables::Decode4[(t1 >> 24) ] << 24) ^ - ((u32)AESTables::Decode4[(t0 >> 16) & 0xff] << 16) ^ - ((u32)AESTables::Decode4[(t3 >> 8) & 0xff] << 8) ^ - ((u32)AESTables::Decode4[(t2 ) & 0xff] ) ^ round_keys[1]; - out.put(4, s1); - - s2 = ((u32)AESTables::Decode4[(t2 >> 24) ] << 24) ^ - ((u32)AESTables::Decode4[(t1 >> 16) & 0xff] << 16) ^ - ((u32)AESTables::Decode4[(t0 >> 8) & 0xff] << 8) ^ - ((u32)AESTables::Decode4[(t3 ) & 0xff] ) ^ round_keys[2]; - out.put(8, s2); - - s3 = ((u32)AESTables::Decode4[(t3 >> 24) ] << 24) ^ - ((u32)AESTables::Decode4[(t2 >> 16) & 0xff] << 16) ^ - ((u32)AESTables::Decode4[(t1 >> 8) & 0xff] << 8) ^ - ((u32)AESTables::Decode4[(t0 ) & 0xff] ) ^ round_keys[3]; - out.put(12, s3); - // clang-format on + return out.slice(0, out_size + final_size); } -void AESCipherBlock::overwrite(ReadonlyBytes bytes) +ErrorOr AESKWCipher::unwrap(ReadonlyBytes ciphertext) const { - auto data = bytes.data(); - auto length = bytes.size(); + auto ctx = TRY(OpenSSL_CIPHER_CTX::create()); - VERIFY(length <= this->data_size()); - this->bytes().overwrite(0, data, length); - if (length < this->data_size()) { - switch (padding_mode()) { - case PaddingMode::Null: - // fill with zeros - __builtin_memset(m_data + length, 0, this->data_size() - length); - break; - case PaddingMode::CMS: - // fill with the length of the padding bytes - __builtin_memset(m_data + length, this->data_size() - length, this->data_size() - length); - break; - case PaddingMode::RFC5246: - // fill with the length of the padding bytes minus one - __builtin_memset(m_data + length, this->data_size() - length - 1, this->data_size() - length); - break; - default: - // FIXME: We should handle the rest of the common padding modes - VERIFY_NOT_REACHED(); - break; - } - } + OPENSSL_TRY(EVP_DecryptInit(ctx.ptr(), m_cipher, m_key.data(), nullptr)); + + auto out = TRY(ByteBuffer::create_uninitialized(ciphertext.size() + block_size())); + int out_size = 0; + OPENSSL_TRY(EVP_DecryptUpdate(ctx.ptr(), out.data(), &out_size, ciphertext.data(), ciphertext.size())); + + int final_size = 0; + OPENSSL_TRY(EVP_DecryptFinal(ctx.ptr(), out.data() + out_size, &final_size)); + + return out.slice(0, out_size + final_size); } } diff --git a/Libraries/LibCrypto/Cipher/AES.h b/Libraries/LibCrypto/Cipher/AES.h index ab2b7b91d73..9edcb6ccac5 100644 --- a/Libraries/LibCrypto/Cipher/AES.h +++ b/Libraries/LibCrypto/Cipher/AES.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2020, Ali Mohammad Pur * Copyright (c) 2022, the SerenityOS developers. + * Copyright (c) 2025, Altomani Gianluca * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,118 +9,63 @@ #pragma once #include -#include -#include -#include -#include -#include +#include namespace Crypto::Cipher { -struct AESCipherBlock : public CipherBlock { +class AESCipher { public: - static constexpr size_t BlockSizeInBits = 128; - - explicit AESCipherBlock(PaddingMode mode = PaddingMode::CMS) - : CipherBlock(mode) - { - } - AESCipherBlock(u8 const* data, size_t length, PaddingMode mode = PaddingMode::CMS) - : AESCipherBlock(mode) - { - CipherBlock::overwrite(data, length); - } - - constexpr static size_t block_size() { return BlockSizeInBits / 8; } - - virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_data, sizeof(m_data) }; } - virtual Bytes bytes() override { return Bytes { m_data, sizeof(m_data) }; } - - virtual void overwrite(ReadonlyBytes) override; - virtual void overwrite(u8 const* data, size_t size) override { overwrite({ data, size }); } - - virtual void apply_initialization_vector(ReadonlyBytes ivec) override - { - for (size_t i = 0; i < min(block_size(), ivec.size()); ++i) - m_data[i] ^= ivec[i]; - } - - ByteString to_byte_string() const; - -private: - constexpr static size_t data_size() { return sizeof(m_data); } - - u8 m_data[BlockSizeInBits / 8] {}; -}; - -struct AESCipherKey : public CipherKey { - virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_rd_keys, sizeof(m_rd_keys) }; } - virtual void expand_encrypt_key(ReadonlyBytes user_key, size_t bits) override; - virtual void expand_decrypt_key(ReadonlyBytes user_key, size_t bits) override; - static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; } - - ByteString to_byte_string() const; - - u32 const* round_keys() const - { - return (u32 const*)m_rd_keys; - } - - AESCipherKey(ReadonlyBytes user_key, size_t key_bits, Intent intent) - : m_bits(key_bits) - { - if (intent == Intent::Encryption) - expand_encrypt_key(user_key, key_bits); - else - expand_decrypt_key(user_key, key_bits); - } - - virtual ~AESCipherKey() override = default; - - size_t rounds() const { return m_rounds; } - size_t length() const { return m_bits / 8; } + size_t block_size() const; protected: - u32* round_keys() + explicit AESCipher(EVP_CIPHER const* cipher, ReadonlyBytes key) + : m_cipher(cipher) + , m_key(key) { - return (u32*)m_rd_keys; } -private: - static constexpr size_t MAX_ROUND_COUNT = 14; - u32 m_rd_keys[(MAX_ROUND_COUNT + 1) * 4] { 0 }; - size_t m_rounds; - size_t m_bits; + EVP_CIPHER const* m_cipher; + ReadonlyBytes m_key; }; -class AESCipher final : public Cipher { +class AESCBCCipher final : public AESCipher { public: - using CBCMode = CBC; - using CTRMode = CTR; - using GCMMode = GCM; - using KWMode = KW; + explicit AESCBCCipher(ReadonlyBytes key, bool no_padding = false); - constexpr static size_t BlockSizeInBits = BlockType::BlockSizeInBits; + ErrorOr encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const; + ErrorOr decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const; - AESCipher(ReadonlyBytes user_key, size_t key_bits, Intent intent = Intent::Encryption, PaddingMode mode = PaddingMode::CMS) - : Cipher(mode) - , m_key(user_key, key_bits, intent) - { - } +private: + bool m_no_padding { false }; +}; - virtual AESCipherKey const& key() const override { return m_key; } - virtual AESCipherKey& key() override { return m_key; } +class AESCTRCipher final : public AESCipher { +public: + explicit AESCTRCipher(ReadonlyBytes key); - virtual void encrypt_block(BlockType const& in, BlockType& out) override; - virtual void decrypt_block(BlockType const& in, BlockType& out) override; + ErrorOr encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv) const; + ErrorOr decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv) const; +}; - virtual ByteString class_name() const override - { - return "AES"; - } +class AESGCMCipher final : public AESCipher { +public: + explicit AESGCMCipher(ReadonlyBytes key); -protected: - AESCipherKey m_key; + struct EncryptedData { + ByteBuffer ciphertext; + ByteBuffer tag; + }; + + ErrorOr encrypt(ReadonlyBytes plaintext, ReadonlyBytes iv, ReadonlyBytes aad, size_t taglen) const; + ErrorOr decrypt(ReadonlyBytes ciphertext, ReadonlyBytes iv, ReadonlyBytes aad, ReadonlyBytes tag) const; +}; + +class AESKWCipher final : public AESCipher { +public: + explicit AESKWCipher(ReadonlyBytes key); + + ErrorOr wrap(ReadonlyBytes) const; + ErrorOr unwrap(ReadonlyBytes) const; }; } diff --git a/Libraries/LibCrypto/Cipher/AESTables.h b/Libraries/LibCrypto/Cipher/AESTables.h deleted file mode 100644 index 14ab8a8c4f1..00000000000 --- a/Libraries/LibCrypto/Cipher/AESTables.h +++ /dev/null @@ -1,416 +0,0 @@ -/* - * Copyright (c) 2020, Ali Mohammad Pur - * Copyright (c) 2021, Alexander Ulmer - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include - -namespace AESTables { - -constexpr u32 Encode0[256] = { - 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, 0xfff2f20dU, 0xd66b6bbdU, - 0xde6f6fb1U, 0x91c5c554U, 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, - 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, 0x8fcaca45U, 0x1f82829dU, - 0x89c9c940U, 0xfa7d7d87U, 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, - 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, 0x239c9cbfU, 0x53a4a4f7U, - 0xe4727296U, 0x9bc0c05bU, 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, - 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, 0x6834345cU, 0x51a5a5f4U, - 0xd1e5e534U, 0xf9f1f108U, 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, - 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, 0x30181828U, 0x379696a1U, - 0x0a05050fU, 0x2f9a9ab5U, 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, - 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, 0x1209091bU, 0x1d83839eU, - 0x582c2c74U, 0x341a1a2eU, 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, - 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, 0x5229297bU, 0xdde3e33eU, - 0x5e2f2f71U, 0x13848497U, 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, - 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, 0xd46a6abeU, 0x8dcbcb46U, - 0x67bebed9U, 0x7239394bU, 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, - 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, 0x864343c5U, 0x9a4d4dd7U, - 0x66333355U, 0x11858594U, 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, - 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, 0xa25151f3U, 0x5da3a3feU, - 0x804040c0U, 0x058f8f8aU, 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, - 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, 0x20101030U, 0xe5ffff1aU, - 0xfdf3f30eU, 0xbfd2d26dU, 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, - 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, 0x93c4c457U, 0x55a7a7f2U, - 0xfc7e7e82U, 0x7a3d3d47U, 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, - 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, 0x44222266U, 0x542a2a7eU, - 0x3b9090abU, 0x0b888883U, 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, - 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, 0xdbe0e03bU, 0x64323256U, - 0x743a3a4eU, 0x140a0a1eU, 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, - 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, 0x399191a8U, 0x319595a4U, - 0xd3e4e437U, 0xf279798bU, 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, - 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, 0xd86c6cb4U, 0xac5656faU, - 0xf3f4f407U, 0xcfeaea25U, 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, - 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, 0x381c1c24U, 0x57a6a6f1U, - 0x73b4b4c7U, 0x97c6c651U, 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, - 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, 0xe0707090U, 0x7c3e3e42U, - 0x71b5b5c4U, 0xcc6666aaU, 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, - 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, 0x17868691U, 0x99c1c158U, - 0x3a1d1d27U, 0x279e9eb9U, 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, - 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, 0x2d9b9bb6U, 0x3c1e1e22U, - 0x15878792U, 0xc9e9e920U, 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, - 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, 0x65bfbfdaU, 0xd7e6e631U, - 0x844242c6U, 0xd06868b8U, 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, - 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU -}; - -constexpr u32 Encode1[256] = { - 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU, 0x0dfff2f2U, 0xbdd66b6bU, - 0xb1de6f6fU, 0x5491c5c5U, 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU, - 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U, 0x458fcacaU, 0x9d1f8282U, - 0x4089c9c9U, 0x87fa7d7dU, 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U, - 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU, 0xbf239c9cU, 0xf753a4a4U, - 0x96e47272U, 0x5b9bc0c0U, 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U, - 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU, 0x5c683434U, 0xf451a5a5U, - 0x34d1e5e5U, 0x08f9f1f1U, 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U, - 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U, 0x28301818U, 0xa1379696U, - 0x0f0a0505U, 0xb52f9a9aU, 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U, - 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U, 0x1b120909U, 0x9e1d8383U, - 0x74582c2cU, 0x2e341a1aU, 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U, - 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U, 0x7b522929U, 0x3edde3e3U, - 0x715e2f2fU, 0x97138484U, 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU, - 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU, 0xbed46a6aU, 0x468dcbcbU, - 0xd967bebeU, 0x4b723939U, 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU, - 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU, 0xc5864343U, 0xd79a4d4dU, - 0x55663333U, 0x94118585U, 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU, - 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U, 0xf3a25151U, 0xfe5da3a3U, - 0xc0804040U, 0x8a058f8fU, 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U, - 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U, 0x30201010U, 0x1ae5ffffU, - 0x0efdf3f3U, 0x6dbfd2d2U, 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU, - 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U, 0x5793c4c4U, 0xf255a7a7U, - 0x82fc7e7eU, 0x477a3d3dU, 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U, - 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU, 0x66442222U, 0x7e542a2aU, - 0xab3b9090U, 0x830b8888U, 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U, - 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU, 0x3bdbe0e0U, 0x56643232U, - 0x4e743a3aU, 0x1e140a0aU, 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU, - 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U, 0xa8399191U, 0xa4319595U, - 0x37d3e4e4U, 0x8bf27979U, 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU, - 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U, 0xb4d86c6cU, 0xfaac5656U, - 0x07f3f4f4U, 0x25cfeaeaU, 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U, - 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU, 0x24381c1cU, 0xf157a6a6U, - 0xc773b4b4U, 0x5197c6c6U, 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU, - 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU, 0x90e07070U, 0x427c3e3eU, - 0xc471b5b5U, 0xaacc6666U, 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU, - 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U, 0x91178686U, 0x5899c1c1U, - 0x273a1d1dU, 0xb9279e9eU, 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U, - 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U, 0xb62d9b9bU, 0x223c1e1eU, - 0x92158787U, 0x20c9e9e9U, 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU, - 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU, 0xda65bfbfU, 0x31d7e6e6U, - 0xc6844242U, 0xb8d06868U, 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU, - 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U -}; - -constexpr u32 Encode2[256] = { - 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU, 0xf20dfff2U, 0x6bbdd66bU, - 0x6fb1de6fU, 0xc55491c5U, 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU, - 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U, 0xca458fcaU, 0x829d1f82U, - 0xc94089c9U, 0x7d87fa7dU, 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U, - 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU, 0x9cbf239cU, 0xa4f753a4U, - 0x7296e472U, 0xc05b9bc0U, 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U, - 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU, 0x345c6834U, 0xa5f451a5U, - 0xe534d1e5U, 0xf108f9f1U, 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U, - 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U, 0x18283018U, 0x96a13796U, - 0x050f0a05U, 0x9ab52f9aU, 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U, - 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U, 0x091b1209U, 0x839e1d83U, - 0x2c74582cU, 0x1a2e341aU, 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U, - 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U, 0x297b5229U, 0xe33edde3U, - 0x2f715e2fU, 0x84971384U, 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU, - 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU, 0x6abed46aU, 0xcb468dcbU, - 0xbed967beU, 0x394b7239U, 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU, - 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU, 0x43c58643U, 0x4dd79a4dU, - 0x33556633U, 0x85941185U, 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU, - 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U, 0x51f3a251U, 0xa3fe5da3U, - 0x40c08040U, 0x8f8a058fU, 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U, - 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U, 0x10302010U, 0xff1ae5ffU, - 0xf30efdf3U, 0xd26dbfd2U, 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU, - 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U, 0xc45793c4U, 0xa7f255a7U, - 0x7e82fc7eU, 0x3d477a3dU, 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U, - 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU, 0x22664422U, 0x2a7e542aU, - 0x90ab3b90U, 0x88830b88U, 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U, - 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU, 0xe03bdbe0U, 0x32566432U, - 0x3a4e743aU, 0x0a1e140aU, 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU, - 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U, 0x91a83991U, 0x95a43195U, - 0xe437d3e4U, 0x798bf279U, 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU, - 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U, 0x6cb4d86cU, 0x56faac56U, - 0xf407f3f4U, 0xea25cfeaU, 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U, - 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU, 0x1c24381cU, 0xa6f157a6U, - 0xb4c773b4U, 0xc65197c6U, 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU, - 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU, 0x7090e070U, 0x3e427c3eU, - 0xb5c471b5U, 0x66aacc66U, 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU, - 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U, 0x86911786U, 0xc15899c1U, - 0x1d273a1dU, 0x9eb9279eU, 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U, - 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U, 0x9bb62d9bU, 0x1e223c1eU, - 0x87921587U, 0xe920c9e9U, 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU, - 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU, 0xbfda65bfU, 0xe631d7e6U, - 0x42c68442U, 0x68b8d068U, 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU, - 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U -}; - -constexpr u32 Encode3[256] = { - 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, 0xf2f20dffU, 0x6b6bbdd6U, - 0x6f6fb1deU, 0xc5c55491U, 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, - 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU, 0xcaca458fU, 0x82829d1fU, - 0xc9c94089U, 0x7d7d87faU, 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU, - 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U, 0x9c9cbf23U, 0xa4a4f753U, - 0x727296e4U, 0xc0c05b9bU, 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU, - 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U, 0x34345c68U, 0xa5a5f451U, - 0xe5e534d1U, 0xf1f108f9U, 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU, - 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU, 0x18182830U, 0x9696a137U, - 0x05050f0aU, 0x9a9ab52fU, 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU, - 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU, 0x09091b12U, 0x83839e1dU, - 0x2c2c7458U, 0x1a1a2e34U, 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU, - 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU, 0x29297b52U, 0xe3e33eddU, - 0x2f2f715eU, 0x84849713U, 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U, - 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U, 0x6a6abed4U, 0xcbcb468dU, - 0xbebed967U, 0x39394b72U, 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U, - 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU, 0x4343c586U, 0x4d4dd79aU, - 0x33335566U, 0x85859411U, 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU, - 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU, 0x5151f3a2U, 0xa3a3fe5dU, - 0x4040c080U, 0x8f8f8a05U, 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U, - 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U, 0x10103020U, 0xffff1ae5U, - 0xf3f30efdU, 0xd2d26dbfU, 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U, - 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU, 0xc4c45793U, 0xa7a7f255U, - 0x7e7e82fcU, 0x3d3d477aU, 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U, - 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U, 0x22226644U, 0x2a2a7e54U, - 0x9090ab3bU, 0x8888830bU, 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U, - 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU, 0xe0e03bdbU, 0x32325664U, - 0x3a3a4e74U, 0x0a0a1e14U, 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U, - 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U, 0x9191a839U, 0x9595a431U, - 0xe4e437d3U, 0x79798bf2U, 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU, - 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U, 0x6c6cb4d8U, 0x5656faacU, - 0xf4f407f3U, 0xeaea25cfU, 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U, - 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU, 0x1c1c2438U, 0xa6a6f157U, - 0xb4b4c773U, 0xc6c65197U, 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU, - 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU, 0x707090e0U, 0x3e3e427cU, - 0xb5b5c471U, 0x6666aaccU, 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU, - 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U, 0x86869117U, 0xc1c15899U, - 0x1d1d273aU, 0x9e9eb927U, 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U, - 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U, 0x9b9bb62dU, 0x1e1e223cU, - 0x87879215U, 0xe9e920c9U, 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U, - 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU, 0xbfbfda65U, 0xe6e631d7U, - 0x4242c684U, 0x6868b8d0U, 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, - 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU -}; - -// Decryption constant tables -constexpr u32 Decode0[256] = { - 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, 0x3bab6bcbU, 0x1f9d45f1U, - 0xacfa58abU, 0x4be30393U, 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, - 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, 0xdeb15a49U, 0x25ba1b67U, - 0x45ea0e98U, 0x5dfec0e1U, 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, - 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, 0xd4be832dU, 0x587421d3U, - 0x49e06929U, 0x8ec9c844U, 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, - 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, 0x63df4a18U, 0xe51a3182U, - 0x97513360U, 0x62537f45U, 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, - 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, 0xab73d323U, 0x724b02e2U, - 0xe31f8f57U, 0x6655ab2aU, 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, - 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, 0x8acf1c2bU, 0xa779b492U, - 0xf307f2f0U, 0x4e69e2a1U, 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, - 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, 0x0b83ec39U, 0x4060efaaU, - 0x5e719f06U, 0xbd6e1051U, 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, - 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, 0x1998fb24U, 0xd6bde997U, - 0x894043ccU, 0x67d99e77U, 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, - 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, 0x09808683U, 0x322bed48U, - 0x1e1170acU, 0x6c5a724eU, 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, - 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, 0x0c0a67b1U, 0x9357e70fU, - 0xb4ee96d2U, 0x1b9b919eU, 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, - 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, 0x0e090d0bU, 0xf28bc7adU, - 0x2db6a8b9U, 0x141ea9c8U, 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, - 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, 0x8b432976U, 0xcb23c6dcU, - 0xb6edfc68U, 0xb8e4f163U, 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, - 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, 0x1d9e2f4bU, 0xdcb230f3U, - 0x0d8652ecU, 0x77c1e3d0U, 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, - 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, 0x87494ec7U, 0xd938d1c1U, - 0x8ccaa2feU, 0x98d40b36U, 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, - 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, 0xf68d13c2U, 0x90d8b8e8U, - 0x2e39f75eU, 0x82c3aff5U, 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, - 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, 0xcd267809U, 0x6e5918f4U, - 0xec9ab701U, 0x834f9aa8U, 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, - 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, 0x31a4b2afU, 0x2a3f2331U, - 0xc6a59430U, 0x35a266c0U, 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, - 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, 0x764dd68dU, 0x43efb04dU, - 0xccaa4d54U, 0xe49604dfU, 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, - 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, 0xb3671d5aU, 0x92dbd252U, - 0xe9105633U, 0x6dd64713U, 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, - 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, 0x9cd2df59U, 0x55f2733fU, - 0x1814ce79U, 0x73c737bfU, 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, - 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, 0x161dc372U, 0xbce2250cU, - 0x283c498bU, 0xff0d9541U, 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, - 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U -}; - -constexpr u32 Decode1[256] = { - 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU, 0xcb3bab6bU, 0xf11f9d45U, - 0xabacfa58U, 0x934be303U, 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU, - 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U, 0x49deb15aU, 0x6725ba1bU, - 0x9845ea0eU, 0xe15dfec0U, 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U, - 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U, 0x2dd4be83U, 0xd3587421U, - 0x2949e069U, 0x448ec9c8U, 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U, - 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU, 0x1863df4aU, 0x82e51a31U, - 0x60975133U, 0x4562537fU, 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU, - 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U, 0x23ab73d3U, 0xe2724b02U, - 0x57e31f8fU, 0x2a6655abU, 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U, - 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U, 0x2b8acf1cU, 0x92a779b4U, - 0xf0f307f2U, 0xa14e69e2U, 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU, - 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU, 0x390b83ecU, 0xaa4060efU, - 0x065e719fU, 0x51bd6e10U, 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU, - 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U, 0x241998fbU, 0x97d6bde9U, - 0xcc894043U, 0x7767d99eU, 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU, - 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U, 0x83098086U, 0x48322bedU, - 0xac1e1170U, 0x4e6c5a72U, 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U, - 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU, 0xb10c0a67U, 0x0f9357e7U, - 0xd2b4ee96U, 0x9e1b9b91U, 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU, - 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U, 0x0b0e090dU, 0xadf28bc7U, - 0xb92db6a8U, 0xc8141ea9U, 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U, - 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU, 0x768b4329U, 0xdccb23c6U, - 0x68b6edfcU, 0x63b8e4f1U, 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U, - 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U, 0x4b1d9e2fU, 0xf3dcb230U, - 0xec0d8652U, 0xd077c1e3U, 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U, - 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U, 0xc787494eU, 0xc1d938d1U, - 0xfe8ccaa2U, 0x3698d40bU, 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU, - 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U, 0xc2f68d13U, 0xe890d8b8U, - 0x5e2e39f7U, 0xf582c3afU, 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U, - 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU, 0x09cd2678U, 0xf46e5918U, - 0x01ec9ab7U, 0xa8834f9aU, 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U, - 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU, 0xaf31a4b2U, 0x312a3f23U, - 0x30c6a594U, 0xc035a266U, 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U, - 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U, 0x8d764dd6U, 0x4d43efb0U, - 0x54ccaa4dU, 0xdfe49604U, 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U, - 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U, 0x5ab3671dU, 0x5292dbd2U, - 0x33e91056U, 0x136dd647U, 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU, - 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U, 0x599cd2dfU, 0x3f55f273U, - 0x791814ceU, 0xbf73c737U, 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU, - 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U, 0x72161dc3U, 0x0cbce225U, - 0x8b283c49U, 0x41ff0d95U, 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U, - 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U -}; - -constexpr u32 Decode2[256] = { - 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U, 0x6bcb3babU, 0x45f11f9dU, - 0x58abacfaU, 0x03934be3U, 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U, - 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U, 0x5a49deb1U, 0x1b6725baU, - 0x0e9845eaU, 0xc0e15dfeU, 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U, - 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U, 0x832dd4beU, 0x21d35874U, - 0x692949e0U, 0xc8448ec9U, 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U, - 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU, 0x4a1863dfU, 0x3182e51aU, - 0x33609751U, 0x7f456253U, 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U, - 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU, 0xd323ab73U, 0x02e2724bU, - 0x8f57e31fU, 0xab2a6655U, 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U, - 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U, 0x1c2b8acfU, 0xb492a779U, - 0xf2f0f307U, 0xe2a14e69U, 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, - 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, 0xec390b83U, 0xefaa4060U, - 0x9f065e71U, 0x1051bd6eU, 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, - 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, 0xfb241998U, 0xe997d6bdU, - 0x43cc8940U, 0x9e7767d9U, 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U, - 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U, 0x86830980U, 0xed48322bU, - 0x70ac1e11U, 0x724e6c5aU, 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU, - 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U, 0x67b10c0aU, 0xe70f9357U, - 0x96d2b4eeU, 0x919e1b9bU, 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U, - 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU, 0x0d0b0e09U, 0xc7adf28bU, - 0xa8b92db6U, 0xa9c8141eU, 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU, - 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU, 0x29768b43U, 0xc6dccb23U, - 0xfc68b6edU, 0xf163b8e4U, 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U, - 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U, 0x2f4b1d9eU, 0x30f3dcb2U, - 0x52ec0d86U, 0xe3d077c1U, 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U, - 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U, 0x4ec78749U, 0xd1c1d938U, - 0xa2fe8ccaU, 0x0b3698d4U, 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU, - 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU, 0x13c2f68dU, 0xb8e890d8U, - 0xf75e2e39U, 0xaff582c3U, 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U, - 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU, 0x7809cd26U, 0x18f46e59U, - 0xb701ec9aU, 0x9aa8834fU, 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U, - 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U, 0xb2af31a4U, 0x23312a3fU, - 0x9430c6a5U, 0x66c035a2U, 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U, - 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U, 0xd68d764dU, 0xb04d43efU, - 0x4d54ccaaU, 0x04dfe496U, 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U, - 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU, 0x1d5ab367U, 0xd25292dbU, - 0x5633e910U, 0x47136dd6U, 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U, - 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U, 0xdf599cd2U, 0x733f55f2U, - 0xce791814U, 0x37bf73c7U, 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U, - 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U, 0xc372161dU, 0x250cbce2U, - 0x498b283cU, 0x9541ff0dU, 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U, - 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U -}; - -constexpr u32 Decode3[256] = { - 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU, 0xab6bcb3bU, 0x9d45f11fU, - 0xfa58abacU, 0xe303934bU, 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U, - 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U, 0xb15a49deU, 0xba1b6725U, - 0xea0e9845U, 0xfec0e15dU, 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU, - 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U, 0xbe832dd4U, 0x7421d358U, - 0xe0692949U, 0xc9c8448eU, 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U, - 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU, 0xdf4a1863U, 0x1a3182e5U, - 0x51336097U, 0x537f4562U, 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U, - 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U, 0x73d323abU, 0x4b02e272U, - 0x1f8f57e3U, 0x55ab2a66U, 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U, - 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU, 0xcf1c2b8aU, 0x79b492a7U, - 0x07f2f0f3U, 0x69e2a14eU, 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U, - 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U, 0x83ec390bU, 0x60efaa40U, - 0x719f065eU, 0x6e1051bdU, 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU, - 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U, 0x98fb2419U, 0xbde997d6U, - 0x4043cc89U, 0xd99e7767U, 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U, - 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U, 0x80868309U, 0x2bed4832U, - 0x1170ac1eU, 0x5a724e6cU, 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U, - 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U, 0x0a67b10cU, 0x57e70f93U, - 0xee96d2b4U, 0x9b919e1bU, 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU, - 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U, 0x090d0b0eU, 0x8bc7adf2U, - 0xb6a8b92dU, 0x1ea9c814U, 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U, - 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU, 0x4329768bU, 0x23c6dccbU, - 0xedfc68b6U, 0xe4f163b8U, 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U, - 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U, 0x9e2f4b1dU, 0xb230f3dcU, - 0x8652ec0dU, 0xc1e3d077U, 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U, - 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U, 0x494ec787U, 0x38d1c1d9U, - 0xcaa2fe8cU, 0xd40b3698U, 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU, - 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U, 0x8d13c2f6U, 0xd8b8e890U, - 0x39f75e2eU, 0xc3aff582U, 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU, - 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU, 0x267809cdU, 0x5918f46eU, - 0x9ab701ecU, 0x4f9aa883U, 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU, - 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U, 0xa4b2af31U, 0x3f23312aU, - 0xa59430c6U, 0xa266c035U, 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U, - 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U, 0x4dd68d76U, 0xefb04d43U, - 0xaa4d54ccU, 0x9604dfe4U, 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U, - 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU, 0x671d5ab3U, 0xdbd25292U, - 0x105633e9U, 0xd647136dU, 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU, - 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU, 0xd2df599cU, 0xf2733f55U, - 0x14ce7918U, 0xc737bf73U, 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U, - 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U, 0x1dc37216U, 0xe2250cbcU, - 0x3c498b28U, 0x0d9541ffU, 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, - 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U -}; - -constexpr u8 Decode4[256] = { - 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U, 0xbfU, 0x40U, 0xa3U, - 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU, 0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, - 0xffU, 0x87U, 0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU, 0x54U, - 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU, 0xeeU, 0x4cU, 0x95U, 0x0bU, - 0x42U, 0xfaU, 0xc3U, 0x4eU, 0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, - 0xb2U, 0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U, 0x72U, 0xf8U, - 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U, 0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, - 0x65U, 0xb6U, 0x92U, 0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU, - 0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U, 0x90U, 0xd8U, 0xabU, - 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU, 0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, - 0x45U, 0x06U, 0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U, 0xc1U, - 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU, 0x3aU, 0x91U, 0x11U, 0x41U, - 0x4fU, 0x67U, 0xdcU, 0xeaU, 0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, - 0x73U, 0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U, 0xe2U, 0xf9U, - 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU, 0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, - 0x29U, 0xc5U, 0x89U, 0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU, - 0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U, 0x9aU, 0xdbU, 0xc0U, - 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U, 0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, - 0xc7U, 0x31U, 0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU, 0x60U, - 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU, 0x2dU, 0xe5U, 0x7aU, 0x9fU, - 0x93U, 0xc9U, 0x9cU, 0xefU, 0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, - 0xb0U, 0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U, 0x17U, 0x2bU, - 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U, 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, - 0x21U, 0x0cU, 0x7dU -}; - -// RCON -constexpr u32 RCON[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, - 0x40000000, 0x80000000, 0x1B000000, 0x36000000 -}; - -} diff --git a/Libraries/LibCrypto/Cipher/Cipher.cpp b/Libraries/LibCrypto/Cipher/Cipher.cpp deleted file mode 100644 index dc3a5538e72..00000000000 --- a/Libraries/LibCrypto/Cipher/Cipher.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2024, Ben Wiederhake - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include - -namespace Crypto::Cipher { - -bool padding_always_needs_extra_block(PaddingMode mode) -{ - switch (mode) { - case PaddingMode::CMS: - return true; - case PaddingMode::RFC5246: - case PaddingMode::Null: - case PaddingMode::Bit: - case PaddingMode::Random: - case PaddingMode::Space: - case PaddingMode::ZeroLength: - return false; - } - VERIFY_NOT_REACHED(); -} - -} diff --git a/Libraries/LibCrypto/Cipher/Cipher.h b/Libraries/LibCrypto/Cipher/Cipher.h deleted file mode 100644 index e83846ff426..00000000000 --- a/Libraries/LibCrypto/Cipher/Cipher.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2020, Ali Mohammad Pur - * Copyright (c) 2022, the SerenityOS developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include - -namespace Crypto::Cipher { - -enum class Intent { - Encryption, - Decryption, -}; - -enum class PaddingMode { - CMS, // RFC 1423 - RFC5246, // very similar to CMS, but filled with |length - 1|, instead of |length| - Null, - ZeroLength, - // FIXME: We do not implement these yet - Bit, - Random, - Space, -}; - -bool padding_always_needs_extra_block(PaddingMode); - -template -class Cipher; - -struct CipherBlock { -public: - explicit CipherBlock(PaddingMode mode) - : m_padding_mode(mode) - { - } - - virtual ReadonlyBytes bytes() const = 0; - - virtual void overwrite(ReadonlyBytes) = 0; - virtual void overwrite(u8 const* data, size_t size) { overwrite({ data, size }); } - - virtual void apply_initialization_vector(ReadonlyBytes ivec) = 0; - - PaddingMode padding_mode() const { return m_padding_mode; } - void set_padding_mode(PaddingMode mode) { m_padding_mode = mode; } - - template - void put(size_t offset, T value) - { - VERIFY(offset + sizeof(T) <= bytes().size()); - auto* ptr = bytes().offset_pointer(offset); - auto index { 0 }; - - VERIFY(sizeof(T) <= 4); - - if constexpr (sizeof(T) > 3) - ptr[index++] = (u8)(value >> 24); - - if constexpr (sizeof(T) > 2) - ptr[index++] = (u8)(value >> 16); - - if constexpr (sizeof(T) > 1) - ptr[index++] = (u8)(value >> 8); - - ptr[index] = (u8)value; - } - -protected: - virtual ~CipherBlock() = default; - -private: - virtual Bytes bytes() = 0; - PaddingMode m_padding_mode; -}; - -struct CipherKey { - virtual ReadonlyBytes bytes() const = 0; - static bool is_valid_key_size(size_t) { return false; } - - virtual ~CipherKey() = default; - -protected: - virtual void expand_encrypt_key(ReadonlyBytes user_key, size_t bits) = 0; - virtual void expand_decrypt_key(ReadonlyBytes user_key, size_t bits) = 0; - size_t bits { 0 }; -}; - -template -class Cipher { -public: - using KeyType = KeyT; - using BlockType = BlockT; - - explicit Cipher(PaddingMode mode) - : m_padding_mode(mode) - { - } - - virtual KeyType const& key() const = 0; - virtual KeyType& key() = 0; - - constexpr static size_t block_size() { return BlockType::block_size(); } - - PaddingMode padding_mode() const { return m_padding_mode; } - - virtual void encrypt_block(BlockType const& in, BlockType& out) = 0; - virtual void decrypt_block(BlockType const& in, BlockType& out) = 0; - - virtual ByteString class_name() const = 0; - -protected: - virtual ~Cipher() = default; - -private: - PaddingMode m_padding_mode; -}; -} diff --git a/Libraries/LibCrypto/Cipher/Mode/CBC.h b/Libraries/LibCrypto/Cipher/Mode/CBC.h deleted file mode 100644 index 03945d79e45..00000000000 --- a/Libraries/LibCrypto/Cipher/Mode/CBC.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2020, Ali Mohammad Pur - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include - -namespace Crypto::Cipher { - -template -class CBC : public Mode { -public: - constexpr static size_t IVSizeInBits = 128; - - virtual ~CBC() = default; - template - explicit constexpr CBC(Args... args) - : Mode(args...) - { - } - - virtual ByteString class_name() const override - { - StringBuilder builder; - builder.append(this->cipher().class_name()); - builder.append("_CBC"sv); - return builder.to_byte_string(); - } - - virtual size_t IV_length() const override - { - return IVSizeInBits / 8; - } - - virtual void encrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}, Bytes* ivec_out = nullptr) 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 - VERIFY(!ivec.is_empty()); - ReadonlyBytes iv = ivec; - - m_cipher_block.set_padding_mode(cipher.padding_mode()); - size_t offset { 0 }; - auto block_size = cipher.block_size(); - - while (length >= block_size) { - m_cipher_block.overwrite(in.slice(offset, block_size)); - m_cipher_block.apply_initialization_vector(iv); - cipher.encrypt_block(m_cipher_block, m_cipher_block); - VERIFY(offset + block_size <= out.size()); - __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), block_size); - iv = out.slice(offset); - length -= block_size; - offset += block_size; - } - - if (length > 0 || padding_always_needs_extra_block(cipher.padding_mode())) { - m_cipher_block.overwrite(in.slice(offset, length)); - m_cipher_block.apply_initialization_vector(iv); - cipher.encrypt_block(m_cipher_block, m_cipher_block); - VERIFY(offset + block_size <= out.size()); - __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), block_size); - iv = out.slice(offset); - offset += block_size; - } - - if (ivec_out) - __builtin_memcpy(ivec_out->data(), iv.data(), min(IV_length(), ivec_out->size())); - - // Indicate how much output was generated. (This can be non-trivial, as it depends on the padding mode.) - out = out.slice(0, offset); - } - - virtual void decrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}) override - { - auto length = in.size(); - if (length == 0) - return; - - auto& cipher = this->cipher(); - - VERIFY(!ivec.is_empty()); - ReadonlyBytes iv = ivec; - - 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? - VERIFY(length % block_size == 0); - - m_cipher_block.set_padding_mode(cipher.padding_mode()); - size_t offset { 0 }; - - while (length > 0) { - auto slice = in.slice(offset); - m_cipher_block.overwrite(slice.data(), block_size); - cipher.decrypt_block(m_cipher_block, m_cipher_block); - m_cipher_block.apply_initialization_vector(iv); - auto decrypted = m_cipher_block.bytes(); - VERIFY(offset + decrypted.size() <= out.size()); - __builtin_memcpy(out.offset(offset), decrypted.data(), decrypted.size()); - iv = slice; - length -= block_size; - offset += block_size; - } - out = out.slice(0, offset); - this->prune_padding(out); - } - -private: - typename T::BlockType m_cipher_block {}; -}; - -} diff --git a/Libraries/LibCrypto/Cipher/Mode/CTR.h b/Libraries/LibCrypto/Cipher/Mode/CTR.h deleted file mode 100644 index 8be6cf022d6..00000000000 --- a/Libraries/LibCrypto/Cipher/Mode/CTR.h +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Copyright (c) 2020, Peter Elliott - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include - -namespace Crypto::Cipher { - -/* - * Heads up: CTR is a *family* of modes, because the "counter" function is - * implementation-defined. This makes interoperability a pain in the neurons. - * Here are several contradicting(!) interpretations: - * - * "The counter can be *any function* which produces a sequence which is - * guaranteed not to repeat for a long time, although an actual increment-by-one - * counter is the simplest and most popular." - * The illustrations show that first increment should happen *after* the first - * round. I call this variant BIGINT_INCR_0. - * The AESAVS goes a step further and requires only that "counters" do not - * repeat, leaving the method of counting completely open. - * See: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Counter_(CTR) - * See: https://csrc.nist.gov/csrc/media/projects/cryptographic-algorithm-validation-program/documents/aes/aesavs.pdf - * - * BIGINT_INCR_0 is the behavior of the OpenSSL command "openssl enc -aes-128-ctr", - * and the behavior of CRYPTO_ctr128_encrypt(). OpenSSL is not alone in the - * assumption that BIGINT_INCR_0 is all there is; even some NIST - * specification/survey(?) doesn't consider counting any other way. - * See: https://github.com/openssl/openssl/blob/33388b44b67145af2181b1e9528c381c8ea0d1b6/crypto/modes/ctr128.c#L71 - * See: http://www.cryptogrium.com/aes-ctr.html - * See: https://web.archive.org/web/20150226072817/http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/ctr/ctr-spec.pdf - * - * "[T]he successive counter blocks are derived by applying an incrementing - * function." - * It defines a *family* of functions called "Standard Incrementing Function" - * which only increment the lower-m bits, for some number 0 0;) { - --i; - if (in[i] == (u8)-1) { - in[i] = 0; - } else { - in[i]++; - break; - } - } - } -}; - -template -class CTR : public Mode { -public: - constexpr static size_t IVSizeInBits = 128; - - virtual ~CTR() = default; - - // Must intercept `Intent`, because AES must always be set to - // Encryption, even when decrypting AES-CTR. - // TODO: How to deal with ciphers that take different arguments? - // FIXME: Add back the default intent parameter once clang-11 is the default in GitHub Actions. - // Once added back, remove the parameter where it's constructed in get_random_bytes in Kernel/Security/Random.h. - template - explicit constexpr CTR(KeyType const& user_key, size_t key_bits, Intent, Args... args) - : Mode(user_key, key_bits, Intent::Encryption, args...) - { - } - - virtual ByteString class_name() const override - { - StringBuilder builder; - builder.append(this->cipher().class_name()); - builder.append("_CTR"sv); - return builder.to_byte_string(); - } - - virtual size_t IV_length() const override - { - return IVSizeInBits / 8; - } - - virtual void encrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}, Bytes* ivec_out = nullptr) override - { - // Our interpretation of "ivec" is what AES-CTR - // would define as nonce + IV + 4 zero bytes. - this->encrypt_or_stream(&in, out, ivec, ivec_out); - } - - void key_stream(Bytes& out, Bytes const& ivec = {}, Bytes* ivec_out = nullptr) - { - this->encrypt_or_stream(nullptr, out, ivec, ivec_out); - } - - virtual void decrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}) override - { - // XOR (and thus CTR) is the most symmetric mode. - this->encrypt(in, out, ivec); - } - -private: - u8 m_ivec_storage[IVSizeInBits / 8]; - typename T::BlockType m_cipher_block {}; - -protected: - constexpr static IncrementFunctionType increment {}; - - void encrypt_or_stream(ReadonlyBytes const* in, Bytes& out, ReadonlyBytes ivec, Bytes* ivec_out = nullptr) - { - size_t length; - if (in) { - VERIFY(in->size() <= out.size()); - length = in->size(); - if (length == 0) - return; - } else { - length = out.size(); - } - - 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 - VERIFY(!ivec.is_empty()); - VERIFY(ivec.size() >= IV_length()); - - m_cipher_block.set_padding_mode(cipher.padding_mode()); - - __builtin_memcpy(m_ivec_storage, ivec.data(), IV_length()); - Bytes iv { m_ivec_storage, IV_length() }; - - size_t offset { 0 }; - auto block_size = cipher.block_size(); - - while (length > 0) { - m_cipher_block.overwrite(iv.slice(0, block_size)); - - cipher.encrypt_block(m_cipher_block, m_cipher_block); - if (in) { - m_cipher_block.apply_initialization_vector(in->slice(offset)); - } - auto write_size = min(block_size, length); - - VERIFY(offset + write_size <= out.size()); - __builtin_memcpy(out.offset(offset), m_cipher_block.bytes().data(), write_size); - - increment(iv); - length -= write_size; - offset += write_size; - } - // FIXME: Apply padding if requested - - if (ivec_out) - __builtin_memcpy(ivec_out->data(), iv.data(), min(ivec_out->size(), IV_length())); - } -}; - -} diff --git a/Libraries/LibCrypto/Cipher/Mode/GCM.h b/Libraries/LibCrypto/Cipher/Mode/GCM.h deleted file mode 100644 index 21186667378..00000000000 --- a/Libraries/LibCrypto/Cipher/Mode/GCM.h +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2020, Ali Mohammad Pur - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Crypto::Cipher { - -using IncrementFunction = IncrementInplace; - -template -class GCM : public CTR { -public: - constexpr static size_t IVSizeInBits = 128; - - virtual ~GCM() = default; - - template - explicit constexpr GCM(Args... args) - : CTR(args...) - { - static_assert(T::BlockSizeInBits == 128u, "GCM Mode is only available for 128-bit Ciphers"); - - __builtin_memset(m_auth_key_storage, 0, block_size); - typename T::BlockType key_block(m_auth_key_storage, block_size); - this->cipher().encrypt_block(key_block, key_block); - key_block.bytes().copy_to(m_auth_key); - - m_ghash = Authentication::GHash(m_auth_key); - } - - virtual ByteString class_name() const override - { - StringBuilder builder; - builder.append(this->cipher().class_name()); - builder.append("_GCM"sv); - return builder.to_byte_string(); - } - - virtual size_t IV_length() const override - { - return IVSizeInBits / 8; - } - - // FIXME: This overload throws away the auth stuff, think up a better way to return more than a single bytebuffer. - virtual void encrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}, Bytes* = nullptr) override - { - VERIFY(!ivec.is_empty()); - - static ByteBuffer dummy; - - encrypt(in, out, ivec, dummy, dummy); - } - virtual void decrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}) override - { - encrypt(in, out, ivec); - } - - ByteBuffer process_iv(ReadonlyBytes iv_in) - { - if (iv_in.size() == 12) { - auto buf = MUST(ByteBuffer::create_zeroed(16)); - buf.overwrite(0, iv_in.data(), iv_in.size()); - - // Increment the IV for block 0 - auto iv = buf.bytes(); - CTR::increment(iv); - - return buf; - } - - // https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf - // Otherwise, the IV is padded with the minimum number of '0' bits, possibly none, - // so that the length of the resulting string is a multiple of 128 bits (the block size); - // this string in turn is appended with 64 additional '0' bits, followed by - // the 64-bit representation of the length of the IV, and the GHASH function - // is applied to the resulting string to form the precounter block. - auto iv_pad = iv_in.size() % 16 == 0 ? 0 : 16 - (iv_in.size() % 16); - auto data = MUST(ByteBuffer::create_zeroed(iv_in.size() + iv_pad + 8 + 8)); - data.overwrite(0, iv_in.data(), iv_in.size()); - ByteReader::store(data.data() + iv_in.size() + iv_pad + 8, AK::convert_between_host_and_big_endian(iv_in.size() * 8)); - - u32 out[4] { 0, 0, 0, 0 }; - m_ghash->process_one(out, data); - - auto buf = MUST(ByteBuffer::create_uninitialized(16)); - for (size_t i = 0; i < 4; ++i) - ByteReader::store(buf.data() + (i * 4), AK::convert_between_host_and_big_endian(out[i])); - return buf; - } - - void encrypt(ReadonlyBytes in, Bytes out, ReadonlyBytes iv_in, ReadonlyBytes aad, Bytes tag) - { - auto iv_buf = process_iv(iv_in); - auto iv = iv_buf.bytes(); - - typename T::BlockType block0; - block0.overwrite(iv); - this->cipher().encrypt_block(block0, block0); - - // Skip past block 0 - CTR::increment(iv); - - if (in.is_empty()) - CTR::key_stream(out, iv); - else - CTR::encrypt(in, out, iv); - - auto auth_tag = m_ghash->process(aad, out); - block0.apply_initialization_vector({ auth_tag.data, array_size(auth_tag.data) }); - (void)block0.bytes().copy_trimmed_to(tag); - } - - VerificationConsistency decrypt(ReadonlyBytes in, Bytes out, ReadonlyBytes iv_in, ReadonlyBytes aad, ReadonlyBytes tag) - { - auto iv_buf = process_iv(iv_in); - auto iv = iv_buf.bytes(); - - typename T::BlockType block0; - block0.overwrite(iv); - this->cipher().encrypt_block(block0, block0); - - // Skip past block 0 - CTR::increment(iv); - - auto auth_tag = m_ghash->process(aad, in); - block0.apply_initialization_vector({ auth_tag.data, array_size(auth_tag.data) }); - - auto test_consistency = [&] { - VERIFY(block0.block_size() >= tag.size()); - if (block0.block_size() < tag.size() || !timing_safe_compare(block0.bytes().data(), tag.data(), tag.size())) - return VerificationConsistency::Inconsistent; - - return VerificationConsistency::Consistent; - }; - - if (in.is_empty()) { - out = {}; - return test_consistency(); - } - - CTR::encrypt(in, out, iv); - return test_consistency(); - } - -private: - static constexpr auto block_size = T::BlockType::BlockSizeInBits / 8; - u8 m_auth_key_storage[block_size]; - Bytes m_auth_key { m_auth_key_storage, block_size }; - Optional m_ghash; -}; - -} diff --git a/Libraries/LibCrypto/Cipher/Mode/KW.h b/Libraries/LibCrypto/Cipher/Mode/KW.h deleted file mode 100644 index 866b56607e9..00000000000 --- a/Libraries/LibCrypto/Cipher/Mode/KW.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2024, Altomani Gianluca - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include - -namespace Crypto::Cipher { - -template -class KW : public Mode { -public: - constexpr static size_t IVSizeInBits = 128; - constexpr static u8 default_iv[8] = { 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6 }; - - virtual ~KW() = default; - template - explicit constexpr KW(Args... args) - : Mode(args...) - { - } - - virtual ByteString class_name() const override - { - StringBuilder builder; - builder.append(this->cipher().class_name()); - builder.append("_KW"sv); - return builder.to_byte_string(); - } - - virtual size_t IV_length() const override - { - return IVSizeInBits / 8; - } - - // FIXME: This overload throws away the validation, think up a better way to return more than a single bytebuffer. - virtual void encrypt(ReadonlyBytes in, Bytes& out, [[maybe_unused]] ReadonlyBytes ivec = {}, [[maybe_unused]] Bytes* ivec_out = nullptr) override - { - this->wrap(in, out); - } - - virtual void decrypt(ReadonlyBytes in, Bytes& out, [[maybe_unused]] ReadonlyBytes ivec = {}) override - { - this->unwrap(in, out); - } - - void wrap(ReadonlyBytes in, Bytes& out) - { - // The plaintext consists of n 64-bit blocks, containing the key data being wrapped. - VERIFY(in.size() % 8 == 0); - VERIFY(out.size() >= in.size() + 8); - - auto& cipher = this->cipher(); - - auto iv = MUST(ByteBuffer::copy(default_iv, 8)); - auto data = MUST(ByteBuffer::copy(in)); - auto data_blocks = data.size() / 8; - - // For j = 0 to 5 - for (size_t j = 0; j < 6; ++j) { - // For i=1 to n - for (size_t i = 0; i < data_blocks; ++i) { - // B = AES(K, A | R[i]) - m_cipher_block.bytes().overwrite(0, iv.data(), 8); - m_cipher_block.bytes().overwrite(8, data.data() + i * 8, 8); - cipher.encrypt_block(m_cipher_block, m_cipher_block); - - // A = MSB(64, B) ^ t where t = (n*j)+i - u64 a = AK::convert_between_host_and_big_endian(ByteReader::load64(m_cipher_block.bytes().data())) ^ ((data_blocks * j) + i + 1); - ByteReader::store(iv.data(), AK::convert_between_host_and_big_endian(a)); - - // R[i] = LSB(64, B) - data.overwrite(i * 8, m_cipher_block.bytes().data() + 8, 8); - } - } - - out.overwrite(0, iv.data(), 8); - out.overwrite(8, data.data(), data.size()); - } - - VerificationConsistency unwrap(ReadonlyBytes in, Bytes& out) - { - // The inputs to the unwrap process are the KEK and (n+1) 64-bit blocks - // of ciphertext consisting of previously wrapped key. - VERIFY(in.size() % 8 == 0); - VERIFY(in.size() > 8); - - // It returns n blocks of plaintext consisting of the n 64 - bit blocks of the decrypted key data. - VERIFY(out.size() >= in.size() - 8); - - auto& cipher = this->cipher(); - - auto iv = MUST(ByteBuffer::copy(in.slice(0, 8))); - auto data = MUST(ByteBuffer::copy(in.slice(8, in.size() - 8))); - auto data_blocks = data.size() / 8; - - // For j = 5 to 0 - for (size_t j = 6; j > 0; --j) { - // For i = n to 1 - for (size_t i = data_blocks; i > 0; --i) { - // B = AES-1(K, (A ^ t) | R[i]) where t = n*j+i - u64 a = AK::convert_between_host_and_big_endian(ByteReader::load64(iv.data())) ^ ((data_blocks * (j - 1)) + i); - ByteReader::store(m_cipher_block.bytes().data(), AK::convert_between_host_and_big_endian(a)); - m_cipher_block.bytes().overwrite(8, data.data() + ((i - 1) * 8), 8); - cipher.decrypt_block(m_cipher_block, m_cipher_block); - - // A = MSB(64, B) - iv.overwrite(0, m_cipher_block.bytes().data(), 8); - - // R[i] = LSB(64, B) - data.overwrite((i - 1) * 8, m_cipher_block.bytes().data() + 8, 8); - } - } - - if (ReadonlyBytes { default_iv, 8 } != iv.bytes()) - return VerificationConsistency::Inconsistent; - - out.overwrite(0, data.data(), data.size()); - return VerificationConsistency::Consistent; - } - -private: - typename T::BlockType m_cipher_block {}; -}; - -} diff --git a/Libraries/LibCrypto/Cipher/Mode/Mode.h b/Libraries/LibCrypto/Cipher/Mode/Mode.h deleted file mode 100644 index 81d64a1eea5..00000000000 --- a/Libraries/LibCrypto/Cipher/Mode/Mode.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2020, Ali Mohammad Pur - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include - -namespace Crypto::Cipher { - -template -class Mode { -public: - virtual ~Mode() = default; - - virtual void encrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}, Bytes* ivec_out = nullptr) = 0; - virtual void decrypt(ReadonlyBytes in, Bytes& out, ReadonlyBytes ivec = {}) = 0; - - virtual size_t IV_length() const = 0; - - T const& cipher() const { return m_cipher; } - - static ErrorOr create_aligned_buffer(size_t input_size) - { - size_t remainder = (input_size + T::block_size()) % T::block_size(); - if (remainder == 0) - return ByteBuffer::create_uninitialized(input_size); - else - return ByteBuffer::create_uninitialized(input_size + T::block_size() - remainder); - } - - virtual ByteString class_name() const = 0; - - T& cipher() - { - return m_cipher; - } - -protected: - virtual void prune_padding(Bytes& data) - { - auto size = data.size(); - switch (m_cipher.padding_mode()) { - case PaddingMode::CMS: { - // rfc5652 Cryptographic Message Syntax (CMS): - // the input shall be padded at the trailing end with k-(lth mod k) octets - // all having value k-(lth mod k), where lth is the length of the input. - auto maybe_padding_length = data[size - 1]; - if (maybe_padding_length > T::block_size()) { - // Invalid padding length (too long) - return; - } - for (auto i = size - maybe_padding_length; i < size; ++i) { - if (data[i] != maybe_padding_length) { - // not padding, part of data - return; - } - } - data = data.slice(0, size - maybe_padding_length); - break; - } - case PaddingMode::RFC5246: { - auto maybe_padding_length = data[size - 1]; - // FIXME: If we want constant-time operations, this loop should not stop - for (auto i = size - maybe_padding_length - 1; i < size; ++i) { - if (data[i] != maybe_padding_length) { - // note that this is likely invalid padding - return; - } - } - data = data.slice(0, size - maybe_padding_length - 1); - break; - } - case PaddingMode::Null: { - while (data[size - 1] == 0) - --size; - data = data.slice(0, size); - break; - } - case PaddingMode::ZeroLength: { - // No padding - break; - } - default: - // FIXME: support other padding modes - VERIFY_NOT_REACHED(); - break; - } - } - - // FIXME: Somehow add a reference version of this - template - Mode(Args... args) - : m_cipher(args...) - { - } - -private: - T m_cipher; -}; -} diff --git a/Libraries/LibCrypto/OpenSSL.cpp b/Libraries/LibCrypto/OpenSSL.cpp index 8cccd6294ba..81d34e14c3f 100644 --- a/Libraries/LibCrypto/OpenSSL.cpp +++ b/Libraries/LibCrypto/OpenSSL.cpp @@ -27,6 +27,11 @@ ErrorOr OpenSSL_MD_CTX::create() return OpenSSL_MD_CTX(OPENSSL_TRY_PTR(EVP_MD_CTX_new())); } +ErrorOr OpenSSL_CIPHER_CTX::create() +{ + return OpenSSL_CIPHER_CTX(OPENSSL_TRY_PTR(EVP_CIPHER_CTX_new())); +} + ErrorOr unsigned_big_integer_to_openssl_bignum(UnsignedBigInteger const& integer) { auto bn = TRY(OpenSSL_BN::create()); diff --git a/Libraries/LibCrypto/OpenSSL.h b/Libraries/LibCrypto/OpenSSL.h index 1a52fd2a1eb..16eadc80ab1 100644 --- a/Libraries/LibCrypto/OpenSSL.h +++ b/Libraries/LibCrypto/OpenSSL.h @@ -111,6 +111,13 @@ class OpenSSL_KDF_CTX { OPENSSL_WRAPPER_CLASS(OpenSSL_KDF_CTX, EVP_KDF_CTX, EVP_KDF_CTX); }; +class OpenSSL_CIPHER_CTX { + OPENSSL_WRAPPER_CLASS(OpenSSL_CIPHER_CTX, EVP_CIPHER_CTX, EVP_CIPHER_CTX); + +public: + static ErrorOr create(); +}; + #undef OPENSSL_WRAPPER_CLASS ErrorOr unsigned_big_integer_to_openssl_bignum(UnsignedBigInteger const& integer); diff --git a/Libraries/LibCrypto/OpenSSLForward.h b/Libraries/LibCrypto/OpenSSLForward.h index 129d1d36bed..4d15b9255e7 100644 --- a/Libraries/LibCrypto/OpenSSLForward.h +++ b/Libraries/LibCrypto/OpenSSLForward.h @@ -17,6 +17,8 @@ typedef struct evp_kdf_st EVP_KDF; typedef struct evp_kdf_ctx_st EVP_KDF_CTX; typedef struct evp_mac_st EVP_MAC; typedef struct evp_mac_ctx_st EVP_MAC_CTX; +typedef struct evp_cipher_st EVP_CIPHER; +typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; void ERR_print_errors_cb(int (*cb)(char const* str, size_t len, void* u), void* u); @@ -27,6 +29,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX*, const EVP_MD*, ENGINE*); int EVP_DigestFinal_ex(EVP_MD_CTX*, unsigned char*, unsigned int*); int EVP_MD_CTX_copy_ex(EVP_MD_CTX*, EVP_MD_CTX const*); +void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX*); void EVP_PKEY_CTX_free(EVP_PKEY_CTX*); void EVP_PKEY_free(EVP_PKEY*); void EVP_KDF_CTX_free(EVP_KDF_CTX* ctx); diff --git a/Libraries/LibWeb/Crypto/CryptoAlgorithms.cpp b/Libraries/LibWeb/Crypto/CryptoAlgorithms.cpp index d0e3f629413..3157e490c42 100644 --- a/Libraries/LibWeb/Crypto/CryptoAlgorithms.cpp +++ b/Libraries/LibWeb/Crypto/CryptoAlgorithms.cpp @@ -2397,22 +2397,16 @@ WebIDL::ExceptionOr> AesCbc::encrypt(AlgorithmParams co return WebIDL::OperationError::create(m_realm, "IV to AES-CBC must be exactly 16 bytes"_string); // 2. Let paddedPlaintext be the result of adding padding octets to the contents of plaintext according to the procedure defined in Section 10.3 of [RFC2315], step 2, with a value of k of 16. - // Note: This is identical to RFC 5652 Cryptographic Message Syntax (CMS). - // We do this during encryption, which avoid reallocating a potentially-large buffer. - auto mode = ::Crypto::Cipher::PaddingMode::CMS; - // 3. Let ciphertext be the result of performing the CBC Encryption operation described in Section 6.2 of [NIST-SP800-38A] using AES as the block cipher, the contents of the iv member of normalizedAlgorithm as the IV input parameter and paddedPlaintext as the input plaintext. auto key_bytes = key->handle().get(); - auto key_bits = key_bytes.size() * 8; - ::Crypto::Cipher::AESCipher::CBCMode cipher(key_bytes, key_bits, ::Crypto::Cipher::Intent::Encryption, mode); - auto iv = normalized_algorithm.iv; - auto ciphertext = TRY_OR_THROW_OOM(m_realm->vm(), cipher.create_aligned_buffer(plaintext.size() + 1)); - auto ciphertext_view = ciphertext.bytes(); - cipher.encrypt(plaintext, ciphertext_view, iv); - ciphertext.trim(ciphertext_view.size(), false); + + ::Crypto::Cipher::AESCBCCipher cipher(key_bytes); + auto maybe_ciphertext = cipher.encrypt(plaintext, normalized_algorithm.iv); + if (maybe_ciphertext.is_error()) + return WebIDL::OperationError::create(m_realm, "Failed to encrypt"_string); // 4. Return the result of creating an ArrayBuffer containing ciphertext. - return JS::ArrayBuffer::create(m_realm, move(ciphertext)); + return JS::ArrayBuffer::create(m_realm, maybe_ciphertext.release_value()); } WebIDL::ExceptionOr> AesCbc::decrypt(AlgorithmParams const& params, GC::Ref key, ByteBuffer const& ciphertext) @@ -2429,29 +2423,16 @@ WebIDL::ExceptionOr> AesCbc::decrypt(AlgorithmParams co return WebIDL::OperationError::create(m_realm, "Ciphertext length must be a multiple of 16 bytes"_string); // 2. Let paddedPlaintext be the result of performing the CBC Decryption operation described in Section 6.2 of [NIST-SP800-38A] using AES as the block cipher, the contents of the iv member of normalizedAlgorithm as the IV input parameter and the contents of ciphertext as the input ciphertext. - auto mode = ::Crypto::Cipher::PaddingMode::CMS; - auto key_bytes = key->handle().get(); - auto key_bits = key_bytes.size() * 8; - ::Crypto::Cipher::AESCipher::CBCMode cipher(key_bytes, key_bits, ::Crypto::Cipher::Intent::Decryption, mode); - auto iv = normalized_algorithm.iv; - auto plaintext = TRY_OR_THROW_OOM(m_realm->vm(), cipher.create_aligned_buffer(ciphertext.size())); - auto plaintext_view = plaintext.bytes(); - cipher.decrypt(ciphertext, plaintext_view, iv); - plaintext.trim(plaintext_view.size(), false); - // 3. Let p be the value of the last octet of paddedPlaintext. // 4. If p is zero or greater than 16, or if any of the last p octets of paddedPlaintext have a value which is not p, then throw an OperationError. // 5. Let plaintext be the result of removing p octets from the end of paddedPlaintext. - // Note that LibCrypto already does the padding removal for us. - // In the case that any issues arise (e.g. inconsistent padding), the padding is instead not trimmed. - // This is *ONLY* meaningful for the specific case of PaddingMode::CMS, as this is the only padding mode that always appends a block. - if (plaintext.size() == ciphertext.size()) { - // Padding was not removed for an unknown reason. Apply Step 4: - return WebIDL::OperationError::create(m_realm, "Inconsistent padding"_string); - } + ::Crypto::Cipher::AESCBCCipher cipher(key->handle().get()); + auto maybe_plaintext = cipher.decrypt(ciphertext, normalized_algorithm.iv); + if (maybe_plaintext.is_error()) + return WebIDL::OperationError::create(m_realm, "Failed to decrypt"_string); // 6. Return the result of creating an ArrayBuffer containing plaintext. - return JS::ArrayBuffer::create(m_realm, move(plaintext)); + return JS::ArrayBuffer::create(m_realm, maybe_plaintext.release_value()); } // https://w3c.github.io/webcrypto/#aes-cbc-operations @@ -2959,17 +2940,13 @@ WebIDL::ExceptionOr> AesCtr::encrypt(AlgorithmParams co // the contents of the counter member of normalizedAlgorithm as the initial value of the counter block, // the length member of normalizedAlgorithm as the input parameter m to the standard counter block incrementing function defined in Appendix B.1 of [NIST-SP800-38A] // and the contents of plaintext as the input plaintext. - auto& aes_algorithm = static_cast(*key->algorithm()); - auto key_length = aes_algorithm.length(); - auto key_bytes = key->handle().get(); - - ::Crypto::Cipher::AESCipher::CTRMode cipher(key_bytes, key_length, ::Crypto::Cipher::Intent::Encryption); - ByteBuffer ciphertext = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_zeroed(plaintext.size())); - Bytes ciphertext_span = ciphertext.bytes(); - cipher.encrypt(plaintext, ciphertext_span, counter); + ::Crypto::Cipher::AESCTRCipher cipher(key->handle().get()); + auto maybe_ciphertext = cipher.encrypt(plaintext, counter); + if (maybe_ciphertext.is_error()) + return WebIDL::OperationError::create(m_realm, "Encryption failed"_string); // 4. Return the result of creating an ArrayBuffer containing plaintext. - return JS::ArrayBuffer::create(m_realm, ciphertext); + return JS::ArrayBuffer::create(m_realm, maybe_ciphertext.release_value()); } WebIDL::ExceptionOr> AesCtr::decrypt(AlgorithmParams const& params, GC::Ref key, ByteBuffer const& ciphertext) @@ -2990,17 +2967,13 @@ WebIDL::ExceptionOr> AesCtr::decrypt(AlgorithmParams co // the contents of the counter member of normalizedAlgorithm as the initial value of the counter block, // the length member of normalizedAlgorithm as the input parameter m to the standard counter block incrementing function defined in Appendix B.1 of [NIST-SP800-38A] // and the contents of ciphertext as the input ciphertext. - auto& aes_algorithm = static_cast(*key->algorithm()); - auto key_length = aes_algorithm.length(); - auto key_bytes = key->handle().get(); - - ::Crypto::Cipher::AESCipher::CTRMode cipher(key_bytes, key_length, ::Crypto::Cipher::Intent::Decryption); - ByteBuffer plaintext = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_zeroed(ciphertext.size())); - Bytes plaintext_span = plaintext.bytes(); - cipher.decrypt(ciphertext, plaintext_span, counter); + ::Crypto::Cipher::AESCTRCipher cipher(key->handle().get()); + auto maybe_plaintext = cipher.decrypt(ciphertext, counter); + if (maybe_plaintext.is_error()) + return WebIDL::OperationError::create(m_realm, "Decryption failed"_string); // 4. Return the result of creating an ArrayBuffer containing plaintext. - return JS::ArrayBuffer::create(m_realm, plaintext); + return JS::ArrayBuffer::create(m_realm, maybe_plaintext.release_value()); } WebIDL::ExceptionOr AesGcm::get_key_length(AlgorithmParams const& params) @@ -3238,15 +3211,13 @@ WebIDL::ExceptionOr> AesGcm::encrypt(AlgorithmParams co // the contents of additionalData as the A input parameter, // tagLength as the t pre-requisite // and the contents of plaintext as the input plaintext. - auto& aes_algorithm = static_cast(*key->algorithm()); - auto key_length = aes_algorithm.length(); - auto key_bytes = key->handle().get(); + ::Crypto::Cipher::AESGCMCipher cipher(key->handle().get()); + auto maybe_encrypted = cipher.encrypt(plaintext, normalized_algorithm.iv, additional_data, tag_length / 8); + if (maybe_encrypted.is_error()) { + return WebIDL::OperationError::create(m_realm, "Encryption failed"_string); + } - ::Crypto::Cipher::AESCipher::GCMMode cipher(key_bytes, key_length, ::Crypto::Cipher::Intent::Encryption); - auto ciphertext = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_zeroed(plaintext.size())); - auto tag = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_zeroed(tag_length / 8)); - - cipher.encrypt(plaintext, ciphertext.bytes(), normalized_algorithm.iv, additional_data, tag.bytes()); + auto [ciphertext, tag] = maybe_encrypted.release_value(); // 7. Let ciphertext be equal to C | T, where '|' denotes concatenation. TRY_OR_THROW_OOM(m_realm->vm(), ciphertext.try_append(tag)); @@ -3300,23 +3271,17 @@ WebIDL::ExceptionOr> AesGcm::decrypt(AlgorithmParams co // tagLength as the t pre-requisite, // the contents of actualCiphertext as the input ciphertext, C // and the contents of tag as the authentication tag, T. - auto& aes_algorithm = static_cast(*key->algorithm()); - auto key_length = aes_algorithm.length(); - auto key_bytes = key->handle().get(); - - ::Crypto::Cipher::AESCipher::GCMMode cipher(key_bytes, key_length, ::Crypto::Cipher::Intent::Decryption); - auto plaintext = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_zeroed(actual_ciphertext.size())); - - auto result = cipher.decrypt(actual_ciphertext.bytes(), plaintext.bytes(), normalized_algorithm.iv, additional_data, tag.bytes()); - // If the result of the algorithm is the indication of inauthenticity, "FAIL": throw an OperationError - if (result == ::Crypto::VerificationConsistency::Inconsistent) + ::Crypto::Cipher::AESGCMCipher cipher(key->handle().get()); + auto maybe_plaintext = cipher.decrypt(actual_ciphertext.bytes(), normalized_algorithm.iv, additional_data, tag); + if (maybe_plaintext.is_error()) { + dbgln("FAILED: {}", maybe_plaintext.error()); return WebIDL::OperationError::create(m_realm, "Decryption failed"_string); + } // Otherwise: Let plaintext be the output P of the Authenticated Decryption Function. - // 9. Return the result of creating an ArrayBuffer containing plaintext. - return JS::ArrayBuffer::create(m_realm, plaintext); + return JS::ArrayBuffer::create(m_realm, maybe_plaintext.release_value()); } WebIDL::ExceptionOr, GC::Ref>> AesGcm::generate_key(AlgorithmParams const& params, bool extractable, Vector const& key_usages) @@ -3624,19 +3589,13 @@ WebIDL::ExceptionOr> AesKw::wrap_key(AlgorithmParams co // 2. Let ciphertext be the result of performing the Key Wrap operation described in Section 2.2.1 of [RFC3394] // with plaintext as the plaintext to be wrapped and using the default Initial Value defined in Section 2.2.3.1 of the same document. - ::Crypto::Cipher::AESCipher::KWMode cipher { - key->handle().get(), - key->handle().get().size() * 8, - ::Crypto::Cipher::Intent::Encryption, - ::Crypto::Cipher::PaddingMode::Null, - }; - - auto ciphertext = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_uninitialized(plaintext.size() + 8)); - auto ciphertext_bytes = ciphertext.bytes(); - cipher.wrap(plaintext.bytes(), ciphertext_bytes); + ::Crypto::Cipher::AESKWCipher cipher(key->handle().get()); + auto maybe_ciphertext = cipher.wrap(plaintext.bytes()); + if (maybe_ciphertext.is_error()) + return WebIDL::OperationError::create(m_realm, "Key wrap failed"_string); // 3. Return ciphertext. - return JS::ArrayBuffer::create(m_realm, ciphertext); + return JS::ArrayBuffer::create(m_realm, maybe_ciphertext.release_value()); } // https://w3c.github.io/webcrypto/#aes-kw-registration @@ -3648,21 +3607,14 @@ WebIDL::ExceptionOr> AesKw::unwrap_key(AlgorithmParams // 1. Let plaintext be the result of performing the Key Unwrap operation described in Section 2.2.2 of [RFC3394] // with ciphertext as the input ciphertext and using the default Initial Value defined in Section 2.2.3.1 of the same document - ::Crypto::Cipher::AESCipher::KWMode cipher { - key->handle().get(), - key->handle().get().size() * 8, - ::Crypto::Cipher::Intent::Decryption, - ::Crypto::Cipher::PaddingMode::Null, - }; - // 2. If the Key Unwrap operation returns an error, then throw an OperationError. - auto out = TRY_OR_THROW_OOM(m_realm->vm(), ByteBuffer::create_uninitialized(ciphertext.size() - 8)); - auto out_bytes = out.bytes(); - if (cipher.unwrap(ciphertext, out_bytes) != ::Crypto::VerificationConsistency::Consistent) + ::Crypto::Cipher::AESKWCipher cipher(key->handle().get()); + auto maybe_plaintext = cipher.unwrap(ciphertext.bytes()); + if (maybe_plaintext.is_error()) return WebIDL::OperationError::create(m_realm, "Key unwrap failed"_string); // 3. Return plaintext. - return JS::ArrayBuffer::create(m_realm, out); + return JS::ArrayBuffer::create(m_realm, maybe_plaintext.release_value()); } // https://w3c.github.io/webcrypto/#hkdf-operations diff --git a/Tests/LibCrypto/TestAES.cpp b/Tests/LibCrypto/TestAES.cpp index c84c033d49b..158d7a537c8 100644 --- a/Tests/LibCrypto/TestAES.cpp +++ b/Tests/LibCrypto/TestAES.cpp @@ -14,20 +14,11 @@ static ReadonlyBytes operator""_b(char const* string, size_t length) return ReadonlyBytes(string, length); } -TEST_CASE(test_AES_CBC_name) -{ - Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriends"_b, 128, Crypto::Cipher::Intent::Encryption); - EXPECT_EQ(cipher.class_name(), "AES_CBC"); -} - static auto test_aes_cbc_encrypt = [](auto& cipher, auto& result) { auto in = "This is a test! This is another test!"_b; - auto out = cipher.create_aligned_buffer(in.size()).release_value(); - auto iv = ByteBuffer::create_zeroed(Crypto::Cipher::AESCipher::block_size()).release_value(); - auto out_span = out.bytes(); - cipher.encrypt(in, out_span, iv); + auto out = TRY_OR_FAIL(cipher.encrypt(in, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b)); EXPECT_EQ(out.size(), sizeof(result)); - EXPECT(memcmp(out_span.data(), result, out_span.size()) == 0); + EXPECT(memcmp(out.data(), result, out.size()) == 0); }; TEST_CASE(test_AES_CBC_encrypt_with_128bit_key) @@ -38,7 +29,7 @@ TEST_CASE(test_AES_CBC_encrypt_with_128bit_key) 0x8b, 0xd3, 0x70, 0x45, 0xf0, 0x79, 0x65, 0xca, 0xb9, 0x03, 0x88, 0x72, 0x1c, 0xdd, 0xab, 0x45, 0x6b, 0x1c }; - Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriends"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESCBCCipher cipher("WellHelloFriends"_b); test_aes_cbc_encrypt(cipher, result); } @@ -50,7 +41,7 @@ TEST_CASE(test_AES_CBC_encrypt_with_192bit_key) 0x68, 0x51, 0x09, 0xd7, 0x3b, 0x48, 0x1b, 0x8a, 0xd3, 0x50, 0x09, 0xba, 0xfc, 0xde, 0x11, 0xe0, 0x3f, 0xcb }; - Crypto::Cipher::AESCipher::CBCMode cipher("Well Hello Friends! whf!"_b, 192, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESCBCCipher cipher("Well Hello Friends! whf!"_b); test_aes_cbc_encrypt(cipher, result); } @@ -62,7 +53,7 @@ TEST_CASE(test_AES_CBC_encrypt_with_256bit_key) 0x47, 0x9f, 0xc2, 0x21, 0xe6, 0x19, 0x62, 0xc3, 0x75, 0xca, 0xab, 0x2d, 0x18, 0xa1, 0x54, 0xd1, 0x41, 0xe6 }; - Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends"_b, 256, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESCBCCipher cipher("WellHelloFriendsWellHelloFriends"_b); test_aes_cbc_encrypt(cipher, result); } @@ -75,21 +66,16 @@ TEST_CASE(test_AES_CBC_encrypt_with_unsigned_256bit_key) 0xd6, 0xa0, 0x46 }; u8 key[] { 0x0a, 0x8c, 0x5b, 0x0d, 0x8a, 0x68, 0x43, 0xf7, 0xaf, 0xc0, 0xe3, 0x4e, 0x4b, 0x43, 0xaa, 0x28, 0x69, 0x9b, 0x6f, 0xe7, 0x24, 0x82, 0x1c, 0x71, 0x86, 0xf6, 0x2b, 0x87, 0xd6, 0x8b, 0x8f, 0xf1 }; - Crypto::Cipher::AESCipher::CBCMode cipher(ReadonlyBytes { key, sizeof(key) }, 256, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESCBCCipher cipher(ReadonlyBytes { key, sizeof(key) }); test_aes_cbc_encrypt(cipher, result); } -// TODO: Test non-CMS padding options for AES CBC encrypt - static auto test_aes_cbc_decrypt = [](auto& cipher, auto& result, auto result_len) { auto true_value = "This is a test! This is another test!"; - auto in = ByteBuffer::copy(result, result_len).release_value(); - auto out = cipher.create_aligned_buffer(in.size()).release_value(); - auto iv = ByteBuffer::create_zeroed(Crypto::Cipher::AESCipher::block_size()).release_value(); - auto out_span = out.bytes(); - cipher.decrypt(in, out_span, iv); - EXPECT_EQ(out_span.size(), strlen(true_value)); - EXPECT(memcmp(out_span.data(), true_value, strlen(true_value)) == 0); + auto in = MUST(ByteBuffer::copy(result, result_len)); + auto out = TRY_OR_FAIL(cipher.decrypt(in, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b)); + EXPECT_EQ(out.size(), strlen(true_value)); + EXPECT(memcmp(out.data(), true_value, strlen(true_value)) == 0); }; TEST_CASE(test_AES_CBC_128bit_key_decrypt) @@ -100,7 +86,7 @@ TEST_CASE(test_AES_CBC_128bit_key_decrypt) 0x8b, 0xd3, 0x70, 0x45, 0xf0, 0x79, 0x65, 0xca, 0xb9, 0x03, 0x88, 0x72, 0x1c, 0xdd, 0xab, 0x45, 0x6b, 0x1c }; - Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriends"_b, 128, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESCBCCipher cipher("WellHelloFriends"_b); test_aes_cbc_decrypt(cipher, result, 48); } @@ -112,7 +98,7 @@ TEST_CASE(test_AES_CBC_192bit_key_decrypt) 0x68, 0x51, 0x09, 0xd7, 0x3b, 0x48, 0x1b, 0x8a, 0xd3, 0x50, 0x09, 0xba, 0xfc, 0xde, 0x11, 0xe0, 0x3f, 0xcb }; - Crypto::Cipher::AESCipher::CBCMode cipher("Well Hello Friends! whf!"_b, 192, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESCBCCipher cipher("Well Hello Friends! whf!"_b); test_aes_cbc_decrypt(cipher, result, 48); } @@ -124,26 +110,19 @@ TEST_CASE(test_AES_CBC_256bit_key_decrypt) 0x47, 0x9f, 0xc2, 0x21, 0xe6, 0x19, 0x62, 0xc3, 0x75, 0xca, 0xab, 0x2d, 0x18, 0xa1, 0x54, 0xd1, 0x41, 0xe6 }; - Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends"_b, 256, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESCBCCipher cipher("WellHelloFriendsWellHelloFriends"_b); test_aes_cbc_decrypt(cipher, result, 48); } static void do_roundtrip_cbc_128_nopad(ReadonlyBytes key, ReadonlyBytes iv, ReadonlyBytes expected_plaintext, ReadonlyBytes expected_ciphertext) { + Crypto::Cipher::AESCBCCipher cipher(key, true); { - Crypto::Cipher::AESCipher::CBCMode cipher(key, 128, Crypto::Cipher::Intent::Encryption, Crypto::Cipher::PaddingMode::ZeroLength); - auto actual_ciphertext_buf = cipher.create_aligned_buffer(expected_ciphertext.size() + 1).release_value(); - actual_ciphertext_buf.zero_fill(); - auto actual_ciphertext = actual_ciphertext_buf.bytes(); - cipher.encrypt(expected_plaintext, actual_ciphertext, iv); + auto actual_ciphertext = TRY_OR_FAIL(cipher.encrypt(expected_plaintext, iv)); EXPECT_EQ(actual_ciphertext, expected_ciphertext); } { - Crypto::Cipher::AESCipher::CBCMode cipher(key, 128, Crypto::Cipher::Intent::Decryption, Crypto::Cipher::PaddingMode::ZeroLength); - auto actual_plaintext_buf = cipher.create_aligned_buffer(expected_plaintext.size() + 17).release_value(); - actual_plaintext_buf.zero_fill(); - auto actual_plaintext = actual_plaintext_buf.bytes(); - cipher.decrypt(expected_ciphertext, actual_plaintext, iv); + auto actual_plaintext = TRY_OR_FAIL(cipher.decrypt(expected_ciphertext, iv)); EXPECT_EQ(actual_plaintext, expected_plaintext); } } @@ -195,20 +174,13 @@ TEST_CASE(test_AES_CBC_128bit_key_encrypt_rfc3602_case2) static void do_roundtrip_cbc_128_cms(ReadonlyBytes key, ReadonlyBytes iv, ReadonlyBytes expected_plaintext, ReadonlyBytes expected_ciphertext) { + Crypto::Cipher::AESCBCCipher cipher(key); { - Crypto::Cipher::AESCipher::CBCMode cipher(key, 128, Crypto::Cipher::Intent::Encryption, Crypto::Cipher::PaddingMode::CMS); - auto actual_ciphertext_buf = cipher.create_aligned_buffer(expected_ciphertext.size() + 1).release_value(); - actual_ciphertext_buf.zero_fill(); - auto actual_ciphertext = actual_ciphertext_buf.bytes(); - cipher.encrypt(expected_plaintext, actual_ciphertext, iv); + auto actual_ciphertext = TRY_OR_FAIL(cipher.encrypt(expected_plaintext, iv)); EXPECT_EQ(actual_ciphertext, expected_ciphertext); } { - Crypto::Cipher::AESCipher::CBCMode cipher(key, 128, Crypto::Cipher::Intent::Decryption, Crypto::Cipher::PaddingMode::CMS); - auto actual_plaintext_buf = cipher.create_aligned_buffer(expected_plaintext.size() + 17).release_value(); - actual_plaintext_buf.zero_fill(); - auto actual_plaintext = actual_plaintext_buf.bytes(); - cipher.decrypt(expected_ciphertext, actual_plaintext, iv); + auto actual_plaintext = TRY_OR_FAIL(cipher.decrypt(expected_ciphertext, iv)); EXPECT_EQ(actual_plaintext, expected_plaintext); } } @@ -235,24 +207,13 @@ TEST_CASE(test_AES_CBC_128bit_key_encrypt_CMS_aligned) do_roundtrip_cbc_128_cms(key, iv, plaintext, ciphertext); } -// TODO: Test non-CMS padding options for AES CBC decrypt - -TEST_CASE(test_AES_CTR_name) -{ - Crypto::Cipher::AESCipher::CTRMode cipher("WellHelloFriends"_b, 128, Crypto::Cipher::Intent::Encryption); - EXPECT_EQ(cipher.class_name(), "AES_CTR"); -} - #define AS_BB(x) (ReadonlyBytes { (x), sizeof((x)) / sizeof((x)[0]) }) static auto test_aes_ctr_encrypt = [](auto key, auto ivec, auto in, auto out_expected) { - // nonce is already included in ivec. - Crypto::Cipher::AESCipher::CTRMode cipher(key, 8 * key.size(), Crypto::Cipher::Intent::Encryption); - ByteBuffer out_actual = ByteBuffer::create_zeroed(in.size()).release_value(); - Bytes out_span = out_actual.bytes(); - cipher.encrypt(in, out_span, ivec); + Crypto::Cipher::AESCTRCipher cipher(key); + auto out_actual = TRY_OR_FAIL(cipher.encrypt(in, ivec)); EXPECT_EQ(out_expected.size(), out_actual.size()); - EXPECT(memcmp(out_expected.data(), out_span.data(), out_expected.size()) == 0); + EXPECT(memcmp(out_expected.data(), out_actual.data(), out_expected.size()) == 0); }; TEST_CASE(test_AES_CTR_128bit_key_encrypt_16bytes) @@ -413,13 +374,10 @@ TEST_CASE(test_AES_CTR_256bit_encrypt_36bytes_with_high_counter) } static auto test_aes_ctr_decrypt = [](auto key, auto ivec, auto in, auto out_expected) { - // nonce is already included in ivec. - Crypto::Cipher::AESCipher::CTRMode cipher(key, 8 * key.size(), Crypto::Cipher::Intent::Decryption); - ByteBuffer out_actual = ByteBuffer::create_zeroed(in.size()).release_value(); - auto out_span = out_actual.bytes(); - cipher.decrypt(in, out_span, ivec); - EXPECT_EQ(out_expected.size(), out_span.size()); - EXPECT(memcmp(out_expected.data(), out_span.data(), out_expected.size()) == 0); + Crypto::Cipher::AESCTRCipher cipher(key); + auto out_actual = TRY_OR_FAIL(cipher.decrypt(in, ivec)); + EXPECT_EQ(out_expected.size(), out_actual.size()); + EXPECT(memcmp(out_expected.data(), out_actual.data(), out_expected.size()) == 0); }; // From RFC 3686, Section 6 @@ -442,288 +400,220 @@ TEST_CASE(test_AES_CTR_128bit_decrypt_16bytes) // If encryption works, then decryption works, too. } -BENCHMARK_CASE(GCM) -{ - Crypto::Authentication::GHash ghash("WellHelloFriends"_b); - auto v = ByteBuffer::create_uninitialized(16 * MiB).release_value(); - fill_with_random(v); - for (size_t i = 0; i < 10; ++i) { - ghash.process(v, "test"_b); - AK::taint_for_optimizer(v); - } -} - -TEST_CASE(test_AES_GCM_name) -{ - Crypto::Cipher::AESCipher::GCMMode cipher("WellHelloFriends"_b, 128, Crypto::Cipher::Intent::Encryption); - EXPECT_EQ(cipher.class_name(), "AES_GCM"); -} - TEST_CASE(test_AES_GCM_128bit_encrypt_empty) { - Crypto::Cipher::AESCipher::GCMMode cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b); u8 result_tag[] { 0x58, 0xe2, 0xfc, 0xce, 0xfa, 0x7e, 0x30, 0x61, 0x36, 0x7f, 0x1d, 0x57, 0xa4, 0xe7, 0x45, 0x5a }; - Bytes out; - auto tag = ByteBuffer::create_uninitialized(16).release_value(); - cipher.encrypt({}, out, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, tag); + auto [ciphertext, tag] = TRY_OR_FAIL(cipher.encrypt({}, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, 16)); EXPECT(memcmp(result_tag, tag.data(), tag.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_encrypt_zeros) { - Crypto::Cipher::AESCipher::GCMMode cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b); u8 result_tag[] { 0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd, 0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf }; u8 result_ct[] { 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92, 0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78 }; - auto tag = ByteBuffer::create_uninitialized(16).release_value(); - auto out = ByteBuffer::create_uninitialized(16).release_value(); - auto out_bytes = out.bytes(); - cipher.encrypt("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, out_bytes, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, tag); - EXPECT(memcmp(result_ct, out.data(), out.size()) == 0); + auto [ciphertext, tag] = TRY_OR_FAIL(cipher.encrypt("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, 16)); + EXPECT(memcmp(result_ct, ciphertext.data(), ciphertext.size()) == 0); EXPECT(memcmp(result_tag, tag.data(), tag.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_encrypt_multiple_blocks_with_iv) { - Crypto::Cipher::AESCipher::GCMMode cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b); u8 result_tag[] { 0x4d, 0x5c, 0x2a, 0xf3, 0x27, 0xcd, 0x64, 0xa6, 0x2c, 0xf3, 0x5a, 0xbd, 0x2b, 0xa6, 0xfa, 0xb4 }; u8 result_ct[] { 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24, 0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c, 0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0, 0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e, 0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c, 0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05, 0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97, 0x3d, 0x58, 0xe0, 0x91, 0x47, 0x3f, 0x59, 0x85 }; - auto tag = ByteBuffer::create_uninitialized(16).release_value(); - auto out = ByteBuffer::create_uninitialized(64).release_value(); - auto out_bytes = out.bytes(); - cipher.encrypt( + auto [ciphertext, tag] = TRY_OR_FAIL(cipher.encrypt( "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39\x1a\xaf\xd2\x55"_b, - out_bytes, "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"_b, - {}, - tag); - EXPECT(memcmp(result_ct, out.data(), out.size()) == 0); + {}, 16)); + EXPECT(memcmp(result_ct, ciphertext.data(), ciphertext.size()) == 0); EXPECT(memcmp(result_tag, tag.data(), tag.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_encrypt_with_aad) { - Crypto::Cipher::AESCipher::GCMMode cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b); u8 result_tag[] { 0x4d, 0x5c, 0x2a, 0xf3, 0x27, 0xcd, 0x64, 0xa6, 0x2c, 0xf3, 0x5a, 0xbd, 0x2b, 0xa6, 0xfa, 0xb4 }; u8 result_ct[] { 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24, 0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c, 0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0, 0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e, 0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c, 0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05, 0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97, 0x3d, 0x58, 0xe0, 0x91, 0x47, 0x3f, 0x59, 0x85 }; - auto tag = ByteBuffer::create_uninitialized(16).release_value(); - auto out = ByteBuffer::create_uninitialized(64).release_value(); - auto out_bytes = out.bytes(); - cipher.encrypt( + auto [ciphertext, tag] = TRY_OR_FAIL(cipher.encrypt( "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39\x1a\xaf\xd2\x55"_b, - out_bytes, "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"_b, - {}, - tag); - EXPECT(memcmp(result_ct, out.data(), out.size()) == 0); + {}, 16)); + EXPECT(memcmp(result_ct, ciphertext.data(), ciphertext.size()) == 0); EXPECT(memcmp(result_tag, tag.data(), tag.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_decrypt_empty) { - Crypto::Cipher::AESCipher::GCMMode cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b); u8 input_tag[] { 0x58, 0xe2, 0xfc, 0xce, 0xfa, 0x7e, 0x30, 0x61, 0x36, 0x7f, 0x1d, 0x57, 0xa4, 0xe7, 0x45, 0x5a }; - Bytes out; - auto consistency = cipher.decrypt({}, out, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 }); - EXPECT_EQ(consistency, Crypto::VerificationConsistency::Consistent); + auto out = TRY_OR_FAIL(cipher.decrypt({}, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 })); EXPECT_EQ(out.size(), 0u); } TEST_CASE(test_AES_GCM_128bit_decrypt_zeros) { - Crypto::Cipher::AESCipher::GCMMode cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b); u8 input_tag[] { 0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd, 0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf }; u8 input_ct[] { 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92, 0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78 }; u8 result_pt[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - auto out = ByteBuffer::create_uninitialized(16).release_value(); - auto out_bytes = out.bytes(); - auto consistency = cipher.decrypt({ input_ct, 16 }, out_bytes, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 }); - EXPECT_EQ(consistency, Crypto::VerificationConsistency::Consistent); + auto out = TRY_OR_FAIL(cipher.decrypt({ input_ct, 16 }, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 })); EXPECT(memcmp(result_pt, out.data(), out.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_decrypt_multiple_blocks_with_iv) { - Crypto::Cipher::AESCipher::GCMMode cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b); u8 input_tag[] { 0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd, 0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf }; u8 input_ct[] { 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92, 0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78 }; u8 result_pt[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - auto out = ByteBuffer::create_uninitialized(16).release_value(); - auto out_bytes = out.bytes(); - auto consistency = cipher.decrypt({ input_ct, 16 }, out_bytes, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 }); - EXPECT_EQ(consistency, Crypto::VerificationConsistency::Consistent); + auto out = TRY_OR_FAIL(cipher.decrypt({ input_ct, 16 }, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"_b, {}, { input_tag, 16 })); EXPECT(memcmp(result_pt, out.data(), out.size()) == 0); } TEST_CASE(test_AES_GCM_128bit_decrypt_multiple_blocks_with_aad) { - Crypto::Cipher::AESCipher::GCMMode cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESGCMCipher cipher("\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"_b); u8 input_tag[] { 0x93, 0xae, 0x16, 0x97, 0x49, 0xa3, 0xbf, 0x39, 0x4f, 0x61, 0xb7, 0xc1, 0xb1, 0x2, 0x4f, 0x60 }; u8 input_ct[] { 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24, 0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c, 0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0, 0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e, 0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c, 0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05, 0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97, 0x3d, 0x58, 0xe0, 0x91, 0x47, 0x3f, 0x59, 0x85 }; u8 result_pt[] { 0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5, 0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a, 0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda, 0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72, 0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53, 0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25, 0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57, 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55 }; - auto out = ByteBuffer::create_uninitialized(64).release_value(); - auto out_bytes = out.bytes(); - auto consistency = cipher.decrypt( + auto out = TRY_OR_FAIL(cipher.decrypt( { input_ct, 64 }, - out_bytes, "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"_b, "\xde\xad\xbe\xef\xfa\xaf\x11\xcc"_b, - { input_tag, 16 }); + { input_tag, 16 })); EXPECT(memcmp(result_pt, out.data(), out.size()) == 0); - EXPECT_EQ(consistency, Crypto::VerificationConsistency::Consistent); } TEST_CASE(test_AES_KW_encrypt_128bits_with_128bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b, 128, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b); auto wrap_result = "\x1F\xA6\x8B\x0A\x81\x12\xB4\x47\xAE\xF3\x4B\xD8\xFB\x5A\x7B\x82\x9D\x3E\x86\x23\x71\xD2\xCF\xE5"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_128bits_with_128bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b, 128, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; auto in = "\x1F\xA6\x8B\x0A\x81\x12\xB4\x47\xAE\xF3\x4B\xD8\xFB\x5A\x7B\x82\x9D\x3E\x86\x23\x71\xD2\xCF\xE5"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); } TEST_CASE(test_AES_KW_encrypt_128bits_with_192bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b, 192, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b); auto wrap_result = "\x96\x77\x8B\x25\xAE\x6C\xA4\x35\xF9\x2B\x5B\x97\xC0\x50\xAE\xD2\x46\x8A\xB8\xA1\x7A\xD8\x4E\x5D"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_128bits_with_192bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b, 192, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; auto in = "\x96\x77\x8B\x25\xAE\x6C\xA4\x35\xF9\x2B\x5B\x97\xC0\x50\xAE\xD2\x46\x8A\xB8\xA1\x7A\xD8\x4E\x5D"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); } TEST_CASE(test_AES_KW_encrypt_128bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto wrap_result = "\x64\xE8\xC3\xF9\xCE\x0F\x5B\xA2\x63\xE9\x77\x79\x05\x81\x8A\x2A\x93\xC8\x19\x1E\x7D\x6E\x8A\xE7"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_128bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"_b; auto in = "\x64\xE8\xC3\xF9\xCE\x0F\x5B\xA2\x63\xE9\x77\x79\x05\x81\x8A\x2A\x93\xC8\x19\x1E\x7D\x6E\x8A\xE7"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); } TEST_CASE(test_AES_KW_encrypt_192bits_with_192bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b, 192, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b); auto wrap_result = "\x03\x1D\x33\x26\x4E\x15\xD3\x32\x68\xF2\x4E\xC2\x60\x74\x3E\xDC\xE1\xC6\xC7\xDD\xEE\x72\x5A\x93\x6B\xA8\x14\x91\x5C\x67\x62\xD2"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_192bits_with_192bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b, 192, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07"_b; auto in = "\x03\x1D\x33\x26\x4E\x15\xD3\x32\x68\xF2\x4E\xC2\x60\x74\x3E\xDC\xE1\xC6\xC7\xDD\xEE\x72\x5A\x93\x6B\xA8\x14\x91\x5C\x67\x62\xD2"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); } TEST_CASE(test_AES_KW_encrypt_192bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto wrap_result = "\xA8\xF9\xBC\x16\x12\xC6\x8B\x3F\xF6\xE6\xF4\xFB\xE3\x0E\x71\xE4\x76\x9C\x8B\x80\xA3\x2C\xB8\x95\x8C\xD5\xD1\x7D\x6B\x25\x4D\xA1"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_192bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07"_b; auto in = "\xA8\xF9\xBC\x16\x12\xC6\x8B\x3F\xF6\xE6\xF4\xFB\xE3\x0E\x71\xE4\x76\x9C\x8B\x80\xA3\x2C\xB8\x95\x8C\xD5\xD1\x7D\x6B\x25\x4D\xA1"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); } TEST_CASE(test_AES_KW_encrypt_256bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Encryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto wrap_result = "\x28\xC9\xF4\x04\xC4\xB8\x10\xF4\xCB\xCC\xB3\x5C\xFB\x87\xF8\x26\x3F\x57\x86\xE2\xD8\x0E\xD3\x26\xCB\xC7\xF0\xE7\x1A\x99\xF4\x3B\xFB\x98\x8B\x9B\x7A\x02\xDD\x21"_b; auto in = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b; - auto wrapped = MUST(ByteBuffer::create_zeroed(in.size() + 8)); - auto wrapped_bytes = wrapped.bytes(); - cipher.wrap(in, wrapped_bytes); - EXPECT(memcmp(wrapped_bytes.data(), wrap_result.data(), wrapped_bytes.size()) == 0); + auto wrapped = TRY_OR_FAIL(cipher.wrap(in)); + EXPECT(memcmp(wrapped.data(), wrap_result.data(), wrapped.size()) == 0); } TEST_CASE(test_AES_KW_decrypt_256bits_with_256bit_key) { - Crypto::Cipher::AESCipher::KWMode cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b, 256, Crypto::Cipher::Intent::Decryption); + Crypto::Cipher::AESKWCipher cipher("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"_b); auto unwrap_result = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"_b; auto in = "\x28\xC9\xF4\x04\xC4\xB8\x10\xF4\xCB\xCC\xB3\x5C\xFB\x87\xF8\x26\x3F\x57\x86\xE2\xD8\x0E\xD3\x26\xCB\xC7\xF0\xE7\x1A\x99\xF4\x3B\xFB\x98\x8B\x9B\x7A\x02\xDD\x21"_b; - auto unwrapped = MUST(ByteBuffer::create_zeroed(in.size() - 8)); - auto unwrapped_bytes = unwrapped.bytes(); - EXPECT_EQ(cipher.unwrap(in, unwrapped_bytes), Crypto::VerificationConsistency::Consistent); - EXPECT(memcmp(unwrapped_bytes.data(), unwrap_result.data(), unwrap_result.size()) == 0); + auto unwrapped = TRY_OR_FAIL(cipher.unwrap(in)); + EXPECT(memcmp(unwrapped.data(), unwrap_result.data(), unwrap_result.size()) == 0); }