RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:37:43 +00:00
Code Issues Activity Actions

LibCrypto: Move each subsection into its own namespace

Browse source
This commit is contained in:
AnotherTest 2020-04-07 14:42:27 +04:30 • committed by Andreas Kling
parent 96dd7c2996
commit 4f89a377a4
9 changed files with 3256 additions and 3228 deletions
Download patch file Download diff file Expand all files Collapse all files

260
Libraries/LibCrypto/Cipher/AES.cpp
View file

@ -28,6 +28,7 @@
#include <LibCrypto/Cipher/AES.h>
namespace Crypto {
namespace Cipher {
template <typename T>
constexpr u32 get_key(T pt)
@ -86,10 +87,10 @@ void AESCipherKey::expand_encrypt_key(const StringView& user_key, size_t bits)
temp = round_key[3];
// clang-format off
round_key[4] = round_key[0] ^
(Tables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^
(Tables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(temp >> 24) ] & 0x000000ff) ^ Tables::RCON[i];
(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];
@ -109,10 +110,10 @@ void AESCipherKey::expand_encrypt_key(const StringView& user_key, size_t bits)
temp = round_key[5];
// clang-format off
round_key[6] = round_key[0] ^
(Tables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^
(Tables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(temp >> 24) ] & 0x000000ff) ^ Tables::RCON[i];
(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];
@ -137,10 +138,10 @@ void AESCipherKey::expand_encrypt_key(const StringView& user_key, size_t bits)
temp = round_key[7];
// clang-format off
round_key[8] = round_key[0] ^
(Tables::Encode2[(temp >> 16) & 0xff] & 0xff000000) ^
(Tables::Encode3[(temp >> 8) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(temp ) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(temp >> 24) ] & 0x000000ff) ^ Tables::RCON[i];
(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];
@ -153,10 +154,10 @@ void AESCipherKey::expand_encrypt_key(const StringView& user_key, size_t bits)
temp = round_key[11];
// clang-format off
round_key[12] = round_key[4] ^
(Tables::Encode2[(temp >> 24) ] & 0xff000000) ^
(Tables::Encode3[(temp >> 16) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(temp >> 8) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(temp ) & 0xff] & 0x000000ff) ;
(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];
@ -189,25 +190,25 @@ void AESCipherKey::expand_decrypt_key(const StringView& user_key, size_t bits)
round_key += 4;
// clang-format off
round_key[0] =
Tables::Decode0[Tables::Encode1[(round_key[0] >> 24) ] & 0xff] ^
Tables::Decode1[Tables::Encode1[(round_key[0] >> 16) & 0xff] & 0xff] ^
Tables::Decode2[Tables::Encode1[(round_key[0] >> 8) & 0xff] & 0xff] ^
Tables::Decode3[Tables::Encode1[(round_key[0] ) & 0xff] & 0xff] ;
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] =
Tables::Decode0[Tables::Encode1[(round_key[1] >> 24) ] & 0xff] ^
Tables::Decode1[Tables::Encode1[(round_key[1] >> 16) & 0xff] & 0xff] ^
Tables::Decode2[Tables::Encode1[(round_key[1] >> 8) & 0xff] & 0xff] ^
Tables::Decode3[Tables::Encode1[(round_key[1] ) & 0xff] & 0xff] ;
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] =
Tables::Decode0[Tables::Encode1[(round_key[2] >> 24) ] & 0xff] ^
Tables::Decode1[Tables::Encode1[(round_key[2] >> 16) & 0xff] & 0xff] ^
Tables::Decode2[Tables::Encode1[(round_key[2] >> 8) & 0xff] & 0xff] ^
Tables::Decode3[Tables::Encode1[(round_key[2] ) & 0xff] & 0xff] ;
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] =
Tables::Decode0[Tables::Encode1[(round_key[3] >> 24) ] & 0xff] ^
Tables::Decode1[Tables::Encode1[(round_key[3] >> 16) & 0xff] & 0xff] ^
Tables::Decode2[Tables::Encode1[(round_key[3] >> 8) & 0xff] & 0xff] ^
Tables::Decode3[Tables::Encode1[(round_key[3] ) & 0xff] & 0xff] ;
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
}
}
@ -232,22 +233,22 @@ void AESCipher::encrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
for (;;) {
++i;
// clang-format off
t0 = Tables::Encode0[(s0 >> 24) ] ^
Tables::Encode1[(s1 >> 16) & 0xff] ^
Tables::Encode2[(s2 >> 8) & 0xff] ^
Tables::Encode3[(s3 ) & 0xff] ^ round_keys[4];
t1 = Tables::Encode0[(s1 >> 24) ] ^
Tables::Encode1[(s2 >> 16) & 0xff] ^
Tables::Encode2[(s3 >> 8) & 0xff] ^
Tables::Encode3[(s0 ) & 0xff] ^ round_keys[5];
t2 = Tables::Encode0[(s2 >> 24) ] ^
Tables::Encode1[(s3 >> 16) & 0xff] ^
Tables::Encode2[(s0 >> 8) & 0xff] ^
Tables::Encode3[(s1 ) & 0xff] ^ round_keys[6];
t3 = Tables::Encode0[(s3 >> 24) ] ^
Tables::Encode1[(s0 >> 16) & 0xff] ^
Tables::Encode2[(s1 >> 8) & 0xff] ^
Tables::Encode3[(s2 ) & 0xff] ^ round_keys[7];
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;
@ -257,49 +258,49 @@ void AESCipher::encrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
break;
// clang-format off
s0 = Tables::Encode0[(t0 >> 24) ] ^
Tables::Encode1[(t1 >> 16) & 0xff] ^
Tables::Encode2[(t2 >> 8) & 0xff] ^
Tables::Encode3[(t3 ) & 0xff] ^ round_keys[0];
s1 = Tables::Encode0[(t1 >> 24) ] ^
Tables::Encode1[(t2 >> 16) & 0xff] ^
Tables::Encode2[(t3 >> 8) & 0xff] ^
Tables::Encode3[(t0 ) & 0xff] ^ round_keys[1];
s2 = Tables::Encode0[(t2 >> 24) ] ^
Tables::Encode1[(t3 >> 16) & 0xff] ^
Tables::Encode2[(t0 >> 8) & 0xff] ^
Tables::Encode3[(t1 ) & 0xff] ^ round_keys[2];
s3 = Tables::Encode0[(t3 >> 24) ] ^
Tables::Encode1[(t0 >> 16) & 0xff] ^
Tables::Encode2[(t1 >> 8) & 0xff] ^
Tables::Encode3[(t2 ) & 0xff] ^ round_keys[3];
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 = (Tables::Encode2[(t0 >> 24) ] & 0xff000000) ^
(Tables::Encode3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(t2 >> 8) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(t3 ) & 0xff] & 0x000000ff) ^ round_keys[0];
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 = (Tables::Encode2[(t1 >> 24) ] & 0xff000000) ^
(Tables::Encode3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(t3 >> 8) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(t0 ) & 0xff] & 0x000000ff) ^ round_keys[1];
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 = (Tables::Encode2[(t2 >> 24) ] & 0xff000000) ^
(Tables::Encode3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(t0 >> 8) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(t1 ) & 0xff] & 0x000000ff) ^ round_keys[2];
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 = (Tables::Encode2[(t3 >> 24) ] & 0xff000000) ^
(Tables::Encode3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
(Tables::Encode0[(t1 >> 8) & 0xff] & 0x0000ff00) ^
(Tables::Encode1[(t2 ) & 0xff] & 0x000000ff) ^ round_keys[3];
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
}
@ -323,22 +324,22 @@ void AESCipher::decrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
// apply the first |r - 1| rounds
for (;;) {
// clang-format off
t0 = Tables::Decode0[(s0 >> 24) ] ^
Tables::Decode1[(s3 >> 16) & 0xff] ^
Tables::Decode2[(s2 >> 8) & 0xff] ^
Tables::Decode3[(s1 ) & 0xff] ^ round_keys[4];
t1 = Tables::Decode0[(s1 >> 24) ] ^
Tables::Decode1[(s0 >> 16) & 0xff] ^
Tables::Decode2[(s3 >> 8) & 0xff] ^
Tables::Decode3[(s2 ) & 0xff] ^ round_keys[5];
t2 = Tables::Decode0[(s2 >> 24) ] ^
Tables::Decode1[(s1 >> 16) & 0xff] ^
Tables::Decode2[(s0 >> 8) & 0xff] ^
Tables::Decode3[(s3 ) & 0xff] ^ round_keys[6];
t3 = Tables::Decode0[(s3 >> 24) ] ^
Tables::Decode1[(s2 >> 16) & 0xff] ^
Tables::Decode2[(s1 >> 8) & 0xff] ^
Tables::Decode3[(s0 ) & 0xff] ^ round_keys[7];
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;
@ -347,49 +348,49 @@ void AESCipher::decrypt_block(const AESCipherBlock& in, AESCipherBlock& out)
break;
// clang-format off
s0 = Tables::Decode0[(t0 >> 24) ] ^
Tables::Decode1[(t3 >> 16) & 0xff] ^
Tables::Decode2[(t2 >> 8) & 0xff] ^
Tables::Decode3[(t1 ) & 0xff] ^ round_keys[0];
s1 = Tables::Decode0[(t1 >> 24) ] ^
Tables::Decode1[(t0 >> 16) & 0xff] ^
Tables::Decode2[(t3 >> 8) & 0xff] ^
Tables::Decode3[(t2 ) & 0xff] ^ round_keys[1];
s2 = Tables::Decode0[(t2 >> 24) ] ^
Tables::Decode1[(t1 >> 16) & 0xff] ^
Tables::Decode2[(t0 >> 8) & 0xff] ^
Tables::Decode3[(t3 ) & 0xff] ^ round_keys[2];
s3 = Tables::Decode0[(t3 >> 24) ] ^
Tables::Decode1[(t2 >> 16) & 0xff] ^
Tables::Decode2[(t1 >> 8) & 0xff] ^
Tables::Decode3[(t0 ) & 0xff] ^ round_keys[3];
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)Tables::Decode4[(t0 >> 24) ] << 24) ^
((u32)Tables::Decode4[(t3 >> 16) & 0xff] << 16) ^
((u32)Tables::Decode4[(t2 >> 8) & 0xff] << 8) ^
((u32)Tables::Decode4[(t1 ) & 0xff] ) ^ round_keys[0];
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)Tables::Decode4[(t1 >> 24) ] << 24) ^
((u32)Tables::Decode4[(t0 >> 16) & 0xff] << 16) ^
((u32)Tables::Decode4[(t3 >> 8) & 0xff] << 8) ^
((u32)Tables::Decode4[(t2 ) & 0xff] ) ^ round_keys[1];
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)Tables::Decode4[(t2 >> 24) ] << 24) ^
((u32)Tables::Decode4[(t1 >> 16) & 0xff] << 16) ^
((u32)Tables::Decode4[(t0 >> 8) & 0xff] << 8) ^
((u32)Tables::Decode4[(t3 ) & 0xff] ) ^ round_keys[2];
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)Tables::Decode4[(t3 >> 24) ] << 24) ^
((u32)Tables::Decode4[(t2 >> 16) & 0xff] << 16) ^
((u32)Tables::Decode4[(t1 >> 8) & 0xff] << 8) ^
((u32)Tables::Decode4[(t0 ) & 0xff] ) ^ round_keys[3];
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
}
@ -416,7 +417,10 @@ void AESCipherBlock::overwrite(const u8* data, size_t length)
default:
// FIXME: We should handle the rest of the common padding modes
ASSERT_NOT_REACHED();
break;
}
}
}
}
}

5
Libraries/LibCrypto/Cipher/AES.h
View file

@ -32,6 +32,7 @@
#include <LibCrypto/Cipher/Mode/CBC.h>
namespace Crypto {
namespace Cipher {
struct AESCipherBlock : public CipherBlock {
public:
explicit AESCipherBlock(PaddingMode mode = PaddingMode::CMS)
@ -123,7 +124,7 @@ protected:
AESCipherKey m_key;
};
namespace Tables {
namespace AESTables {
// Encryption constant tables
constexpr u32 Encode0[256] = {
0xc66363a5U,
@ -2465,3 +2466,5 @@ namespace Tables {
};
}
}
}

5
Libraries/LibCrypto/Cipher/Cipher.h
View file

@ -28,10 +28,10 @@
#include <AK/ByteBuffer.h>
#include <AK/Optional.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
namespace Crypto {
namespace Cipher {
enum class Intent {
Encryption,
@ -130,7 +130,8 @@ public:
virtual void decrypt_block(const BlockType& in, BlockType& out) = 0;
private:
PaddingMode m_padding_mode { PaddingMode::CMS };
PaddingMode m_padding_mode;
};
}
}

3
Libraries/LibCrypto/Cipher/Mode/CBC.h
View file

@ -29,6 +29,7 @@
#include <LibCrypto/Cipher/Mode/Mode.h>
namespace Crypto {
namespace Cipher {
template <typename T>
class CBC : public Mode<T> {
@ -112,3 +113,5 @@ public:
};
}
}

3
Libraries/LibCrypto/Cipher/Mode/Mode.h
View file

@ -30,6 +30,7 @@
#include <LibCrypto/Cipher/Cipher.h>
namespace Crypto {
namespace Cipher {
template <typename T>
class Mode {
@ -95,3 +96,5 @@ private:
T m_cipher;
};
}
}

9
Libraries/LibCrypto/Hash/HashFunction.h
View file

@ -31,15 +31,18 @@
#include <AK/Types.h>
namespace Crypto {
namespace Hash {
template <size_t BlockS, typename DigestT>
class HashFunction {
public:
static constexpr auto BlockSize = BlockS;
static constexpr auto BlockSize = BlockS / 8;
static constexpr auto DigestSize = sizeof(DigestT);
using DigestType = DigestT;
static size_t block_size() { return BlockSize; };
static size_t digest_size() { return sizeof(DigestType); };
static size_t digest_size() { return DigestSize; };
virtual void update(const u8*, size_t) = 0;
virtual void update(const ByteBuffer& buffer) = 0;
@ -47,5 +50,5 @@ public:
virtual DigestType digest() = 0;
};
}
}

141
Libraries/LibCrypto/Hash/MD5.cpp
View file

@ -65,6 +65,7 @@ static constexpr inline void round_4(u32& a, u32 b, u32 c, u32 d, u32 x, u32 s,
}
namespace Crypto {
namespace Hash {
void MD5::update(const u8* input, size_t length)
{
@ -86,7 +87,6 @@ void MD5::update(const u8* input, size_t length)
index = 0;
}
ASSERT(length < part_length || length - offset <= 64);
m_buffer.overwrite(index, &input[offset], length - offset);
}
@ -100,7 +100,7 @@ MD5::DigestType MD5::digest()
// pad the data to 56%64
u32 index = (u32)((m_count[0] >> 3) & 0x3f);
u32 pad_length = index < 56 ? 56 - index : 120 - index;
update(Constants::PADDING, pad_length);
update(MD5Constants::PADDING, pad_length);
// append length
update(bits, 8);
@ -139,73 +139,73 @@ void MD5::transform(const u8* block)
decode(block, x, 64);
round_1(a, b, c, d, x[0], Constants::S11, 0xd76aa478); // 1
round_1(d, a, b, c, x[1], Constants::S12, 0xe8c7b756); // 2
round_1(c, d, a, b, x[2], Constants::S13, 0x242070db); // 3
round_1(b, c, d, a, x[3], Constants::S14, 0xc1bdceee); // 4
round_1(a, b, c, d, x[4], Constants::S11, 0xf57c0faf); // 5
round_1(d, a, b, c, x[5], Constants::S12, 0x4787c62a); // 6
round_1(c, d, a, b, x[6], Constants::S13, 0xa8304613); // 7
round_1(b, c, d, a, x[7], Constants::S14, 0xfd469501); // 8
round_1(a, b, c, d, x[8], Constants::S11, 0x698098d8); // 9
round_1(d, a, b, c, x[9], Constants::S12, 0x8b44f7af); // 10
round_1(c, d, a, b, x[10], Constants::S13, 0xffff5bb1); // 11
round_1(b, c, d, a, x[11], Constants::S14, 0x895cd7be); // 12
round_1(a, b, c, d, x[12], Constants::S11, 0x6b901122); // 13
round_1(d, a, b, c, x[13], Constants::S12, 0xfd987193); // 14
round_1(c, d, a, b, x[14], Constants::S13, 0xa679438e); // 15
round_1(b, c, d, a, x[15], Constants::S14, 0x49b40821); // 16
round_1(a, b, c, d, x[0], MD5Constants::S11, 0xd76aa478); // 1
round_1(d, a, b, c, x[1], MD5Constants::S12, 0xe8c7b756); // 2
round_1(c, d, a, b, x[2], MD5Constants::S13, 0x242070db); // 3
round_1(b, c, d, a, x[3], MD5Constants::S14, 0xc1bdceee); // 4
round_1(a, b, c, d, x[4], MD5Constants::S11, 0xf57c0faf); // 5
round_1(d, a, b, c, x[5], MD5Constants::S12, 0x4787c62a); // 6
round_1(c, d, a, b, x[6], MD5Constants::S13, 0xa8304613); // 7
round_1(b, c, d, a, x[7], MD5Constants::S14, 0xfd469501); // 8
round_1(a, b, c, d, x[8], MD5Constants::S11, 0x698098d8); // 9
round_1(d, a, b, c, x[9], MD5Constants::S12, 0x8b44f7af); // 10
round_1(c, d, a, b, x[10], MD5Constants::S13, 0xffff5bb1); // 11
round_1(b, c, d, a, x[11], MD5Constants::S14, 0x895cd7be); // 12
round_1(a, b, c, d, x[12], MD5Constants::S11, 0x6b901122); // 13
round_1(d, a, b, c, x[13], MD5Constants::S12, 0xfd987193); // 14
round_1(c, d, a, b, x[14], MD5Constants::S13, 0xa679438e); // 15
round_1(b, c, d, a, x[15], MD5Constants::S14, 0x49b40821); // 16
round_2(a, b, c, d, x[1], Constants::S21, 0xf61e2562); // 17
round_2(d, a, b, c, x[6], Constants::S22, 0xc040b340); // 18
round_2(c, d, a, b, x[11], Constants::S23, 0x265e5a51); // 19
round_2(b, c, d, a, x[0], Constants::S24, 0xe9b6c7aa); // 20
round_2(a, b, c, d, x[5], Constants::S21, 0xd62f105d); // 21
round_2(d, a, b, c, x[10], Constants::S22, 0x2441453); // 22
round_2(c, d, a, b, x[15], Constants::S23, 0xd8a1e681); // 23
round_2(b, c, d, a, x[4], Constants::S24, 0xe7d3fbc8); // 24
round_2(a, b, c, d, x[9], Constants::S21, 0x21e1cde6); // 25
round_2(d, a, b, c, x[14], Constants::S22, 0xc33707d6); // 26
round_2(c, d, a, b, x[3], Constants::S23, 0xf4d50d87); // 27
round_2(b, c, d, a, x[8], Constants::S24, 0x455a14ed); // 28
round_2(a, b, c, d, x[13], Constants::S21, 0xa9e3e905); // 29
round_2(d, a, b, c, x[2], Constants::S22, 0xfcefa3f8); // 30
round_2(c, d, a, b, x[7], Constants::S23, 0x676f02d9); // 31
round_2(b, c, d, a, x[12], Constants::S24, 0x8d2a4c8a); // 32
round_2(a, b, c, d, x[1], MD5Constants::S21, 0xf61e2562); // 17
round_2(d, a, b, c, x[6], MD5Constants::S22, 0xc040b340); // 18
round_2(c, d, a, b, x[11], MD5Constants::S23, 0x265e5a51); // 19
round_2(b, c, d, a, x[0], MD5Constants::S24, 0xe9b6c7aa); // 20
round_2(a, b, c, d, x[5], MD5Constants::S21, 0xd62f105d); // 21
round_2(d, a, b, c, x[10], MD5Constants::S22, 0x2441453); // 22
round_2(c, d, a, b, x[15], MD5Constants::S23, 0xd8a1e681); // 23
round_2(b, c, d, a, x[4], MD5Constants::S24, 0xe7d3fbc8); // 24
round_2(a, b, c, d, x[9], MD5Constants::S21, 0x21e1cde6); // 25
round_2(d, a, b, c, x[14], MD5Constants::S22, 0xc33707d6); // 26
round_2(c, d, a, b, x[3], MD5Constants::S23, 0xf4d50d87); // 27
round_2(b, c, d, a, x[8], MD5Constants::S24, 0x455a14ed); // 28
round_2(a, b, c, d, x[13], MD5Constants::S21, 0xa9e3e905); // 29
round_2(d, a, b, c, x[2], MD5Constants::S22, 0xfcefa3f8); // 30
round_2(c, d, a, b, x[7], MD5Constants::S23, 0x676f02d9); // 31
round_2(b, c, d, a, x[12], MD5Constants::S24, 0x8d2a4c8a); // 32
round_3(a, b, c, d, x[5], Constants::S31, 0xfffa3942); // 33
round_3(d, a, b, c, x[8], Constants::S32, 0x8771f681); // 34
round_3(c, d, a, b, x[11], Constants::S33, 0x6d9d6122); // 35
round_3(b, c, d, a, x[14], Constants::S34, 0xfde5380c); // 36
round_3(a, b, c, d, x[1], Constants::S31, 0xa4beea44); // 37
round_3(d, a, b, c, x[4], Constants::S32, 0x4bdecfa9); // 38
round_3(c, d, a, b, x[7], Constants::S33, 0xf6bb4b60); // 39
round_3(b, c, d, a, x[10], Constants::S34, 0xbebfbc70); // 40
round_3(a, b, c, d, x[13], Constants::S31, 0x289b7ec6); // 41
round_3(d, a, b, c, x[0], Constants::S32, 0xeaa127fa); // 42
round_3(c, d, a, b, x[3], Constants::S33, 0xd4ef3085); // 43
round_3(b, c, d, a, x[6], Constants::S34, 0x4881d05); // 44
round_3(a, b, c, d, x[9], Constants::S31, 0xd9d4d039); // 45
round_3(d, a, b, c, x[12], Constants::S32, 0xe6db99e5); // 46
round_3(c, d, a, b, x[15], Constants::S33, 0x1fa27cf8); // 47
round_3(b, c, d, a, x[2], Constants::S34, 0xc4ac5665); // 48
round_3(a, b, c, d, x[5], MD5Constants::S31, 0xfffa3942); // 33
round_3(d, a, b, c, x[8], MD5Constants::S32, 0x8771f681); // 34
round_3(c, d, a, b, x[11], MD5Constants::S33, 0x6d9d6122); // 35
round_3(b, c, d, a, x[14], MD5Constants::S34, 0xfde5380c); // 36
round_3(a, b, c, d, x[1], MD5Constants::S31, 0xa4beea44); // 37
round_3(d, a, b, c, x[4], MD5Constants::S32, 0x4bdecfa9); // 38
round_3(c, d, a, b, x[7], MD5Constants::S33, 0xf6bb4b60); // 39
round_3(b, c, d, a, x[10], MD5Constants::S34, 0xbebfbc70); // 40
round_3(a, b, c, d, x[13], MD5Constants::S31, 0x289b7ec6); // 41
round_3(d, a, b, c, x[0], MD5Constants::S32, 0xeaa127fa); // 42
round_3(c, d, a, b, x[3], MD5Constants::S33, 0xd4ef3085); // 43
round_3(b, c, d, a, x[6], MD5Constants::S34, 0x4881d05); // 44
round_3(a, b, c, d, x[9], MD5Constants::S31, 0xd9d4d039); // 45
round_3(d, a, b, c, x[12], MD5Constants::S32, 0xe6db99e5); // 46
round_3(c, d, a, b, x[15], MD5Constants::S33, 0x1fa27cf8); // 47
round_3(b, c, d, a, x[2], MD5Constants::S34, 0xc4ac5665); // 48
round_4(a, b, c, d, x[0], Constants::S41, 0xf4292244); // 49
round_4(d, a, b, c, x[7], Constants::S42, 0x432aff97); // 50
round_4(c, d, a, b, x[14], Constants::S43, 0xab9423a7); // 51
round_4(b, c, d, a, x[5], Constants::S44, 0xfc93a039); // 52
round_4(a, b, c, d, x[12], Constants::S41, 0x655b59c3); // 53
round_4(d, a, b, c, x[3], Constants::S42, 0x8f0ccc92); // 54
round_4(c, d, a, b, x[10], Constants::S43, 0xffeff47d); // 55
round_4(b, c, d, a, x[1], Constants::S44, 0x85845dd1); // 56
round_4(a, b, c, d, x[8], Constants::S41, 0x6fa87e4f); // 57
round_4(d, a, b, c, x[15], Constants::S42, 0xfe2ce6e0); // 58
round_4(c, d, a, b, x[6], Constants::S43, 0xa3014314); // 59
round_4(b, c, d, a, x[13], Constants::S44, 0x4e0811a1); // 60
round_4(a, b, c, d, x[4], Constants::S41, 0xf7537e82); // 61
round_4(d, a, b, c, x[11], Constants::S42, 0xbd3af235); // 62
round_4(c, d, a, b, x[2], Constants::S43, 0x2ad7d2bb); // 63
round_4(b, c, d, a, x[9], Constants::S44, 0xeb86d391); // 64
round_4(a, b, c, d, x[0], MD5Constants::S41, 0xf4292244); // 49
round_4(d, a, b, c, x[7], MD5Constants::S42, 0x432aff97); // 50
round_4(c, d, a, b, x[14], MD5Constants::S43, 0xab9423a7); // 51
round_4(b, c, d, a, x[5], MD5Constants::S44, 0xfc93a039); // 52
round_4(a, b, c, d, x[12], MD5Constants::S41, 0x655b59c3); // 53
round_4(d, a, b, c, x[3], MD5Constants::S42, 0x8f0ccc92); // 54
round_4(c, d, a, b, x[10], MD5Constants::S43, 0xffeff47d); // 55
round_4(b, c, d, a, x[1], MD5Constants::S44, 0x85845dd1); // 56
round_4(a, b, c, d, x[8], MD5Constants::S41, 0x6fa87e4f); // 57
round_4(d, a, b, c, x[15], MD5Constants::S42, 0xfe2ce6e0); // 58
round_4(c, d, a, b, x[6], MD5Constants::S43, 0xa3014314); // 59
round_4(b, c, d, a, x[13], MD5Constants::S44, 0x4e0811a1); // 60
round_4(a, b, c, d, x[4], MD5Constants::S41, 0xf7537e82); // 61
round_4(d, a, b, c, x[11], MD5Constants::S42, 0xbd3af235); // 62
round_4(c, d, a, b, x[2], MD5Constants::S43, 0x2ad7d2bb); // 63
round_4(b, c, d, a, x[9], MD5Constants::S44, 0xeb86d391); // 64
m_A += a;
m_B += b;
@ -217,10 +217,10 @@ void MD5::transform(const u8* block)
void MD5::reset()
{
m_A = Constants::init_A;
m_B = Constants::init_B;
m_C = Constants::init_C;
m_D = Constants::init_D;
m_A = MD5Constants::init_A;
m_B = MD5Constants::init_B;
m_C = MD5Constants::init_C;
m_D = MD5Constants::init_D;
m_count[0] = 0;
m_count[1] = 0;
@ -229,3 +229,4 @@ void MD5::reset()
}
}
}

6
Libraries/LibCrypto/Hash/MD5.h
View file

@ -30,6 +30,7 @@
#include <LibCrypto/Hash/HashFunction.h>
namespace Crypto {
namespace Hash {
struct MD5Digest {
u8 data[16];
@ -64,10 +65,9 @@ constexpr u8 PADDING[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0
};
}
class MD5 final : public HashFunction<16, MD5Digest> {
class MD5 final : public HashFunction<512, MD5Digest> {
public:
MD5()
{
@ -96,7 +96,7 @@ private:
static void encode(const u32* from, u8* to, size_t length);
static void decode(const u8* from, u32* to, size_t length);
u32 m_A { Constants::init_A }, m_B { Constants::init_B }, m_C { Constants::init_C }, m_D { Constants::init_D };
u32 m_A { MD5Constants::init_A }, m_B { MD5Constants::init_B }, m_C { MD5Constants::init_C }, m_D { MD5Constants::init_D };
u32 m_count[2] { 0, 0 };
ByteBuffer m_buffer;

86
Userland/test-crypto.cpp
View file

@ -68,10 +68,10 @@ void aes_cbc(const char* message, size_t len)
{
auto buffer = ByteBuffer::wrap(message, len);
// FIXME: Take iv as an optional parameter
auto iv = ByteBuffer::create_zeroed(Crypto::AESCipher::block_size());
auto iv = ByteBuffer::create_zeroed(Crypto::Cipher::AESCipher::block_size());
if (encrypting) {
Crypto::AESCipher::CBCMode cipher(secret_key, key_bits, Crypto::Intent::Encryption);
Crypto::Cipher::AESCipher::CBCMode cipher(secret_key, key_bits, Crypto::Cipher::Intent::Encryption);
auto enc = cipher.create_aligned_buffer(buffer.size());
cipher.encrypt(buffer, enc, iv);
@ -79,9 +79,9 @@ void aes_cbc(const char* message, size_t len)
if (binary)
printf("%.*s", (int)enc.size(), enc.data());
else
print_buffer(enc, Crypto::AESCipher::block_size());
print_buffer(enc, Crypto::Cipher::AESCipher::block_size());
} else {
Crypto::AESCipher::CBCMode cipher(secret_key, key_bits, Crypto::Intent::Decryption);
Crypto::Cipher::AESCipher::CBCMode cipher(secret_key, key_bits, Crypto::Cipher::Intent::Decryption);
auto dec = cipher.create_aligned_buffer(buffer.size());
cipher.decrypt(buffer, dec, iv);
printf("%.*s\n", (int)dec.size(), dec.data());
@ -90,11 +90,21 @@ void aes_cbc(const char* message, size_t len)
void md5(const char* message, size_t len)
{
auto digest = Crypto::MD5::hash((const u8*)message, len);
auto digest = Crypto::Hash::MD5::hash((const u8*)message, len);
if (binary)
printf("%.*s", (int)Crypto::MD5::block_size(), digest.data);
printf("%.*s", (int)Crypto::Hash::MD5::digest_size(), digest.data);
else
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), Crypto::MD5::block_size());
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
}
void hmac_md5(const char* message, size_t len)
{
Crypto::Authentication::HMAC<Crypto::Hash::MD5> hmac(secret_key);
auto mac = hmac.process((const u8*)message, len);
if (binary)
printf("%.*s", (int)hmac.DigestSize, mac.data);
else
print_buffer(ByteBuffer::wrap(mac.data, hmac.DigestSize), -1);
}
auto main(int argc, char** argv) -> int
@ -103,7 +113,7 @@ auto main(int argc, char** argv) -> int
Core::ArgsParser parser;
parser.add_positional_argument(mode, "mode to operate in ('list' to see modes and descriptions)", "mode");
parser.add_option(secret_key, "Set the secret key (must be key-bits bits)", "secret-key", 'k', "secret key");
parser.add_option(secret_key, "Set the secret key", "secret-key", 'k', "secret key");
parser.add_option(key_bits, "Size of the key", "key-bits", 'b', "key-bits");
parser.add_option(filename, "Read from file", "file", 'f', "from file");
parser.add_option(binary, "Force binary output", "force-binary", 0);
@ -143,7 +153,7 @@ auto main(int argc, char** argv) -> int
if (run_tests)
return aes_cbc_tests();
if (!Crypto::AESCipher::KeyType::is_valid_key_size(key_bits)) {
if (!Crypto::Cipher::AESCipher::KeyType::is_valid_key_size(key_bits)) {
printf("Invalid key size for AES: %d\n", key_bits);
return 1;
}
@ -199,13 +209,13 @@ void aes_cbc_test_encrypt()
auto test_it = [](auto& cipher, auto& result) {
auto in = "This is a test! This is another test!"_b;
auto out = cipher.create_aligned_buffer(in.size());
auto iv = ByteBuffer::create_zeroed(Crypto::AESCipher::block_size());
auto iv = ByteBuffer::create_zeroed(Crypto::Cipher::AESCipher::block_size());
cipher.encrypt(in, out, iv);
if (out.size() != sizeof(result))
FAIL(size mismatch);
else if (memcmp(out.data(), result, out.size()) != 0) {
FAIL(invalid data);
print_buffer(out, Crypto::AESCipher::block_size());
print_buffer(out, Crypto::Cipher::AESCipher::block_size());
} else
PASS;
};
@ -217,7 +227,7 @@ void aes_cbc_test_encrypt()
0x8b, 0xd3, 0x70, 0x45, 0xf0, 0x79, 0x65, 0xca, 0xb9, 0x03, 0x88, 0x72, 0x1c, 0xdd, 0xab,
0x45, 0x6b, 0x1c
};
Crypto::AESCipher::CBCMode cipher("WellHelloFriends", 128, Crypto::Intent::Encryption);
Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriends", 128, Crypto::Cipher::Intent::Encryption);
test_it(cipher, result);
}
{
@ -228,7 +238,7 @@ void aes_cbc_test_encrypt()
0x68, 0x51, 0x09, 0xd7, 0x3b, 0x48, 0x1b, 0x8a, 0xd3, 0x50, 0x09, 0xba, 0xfc, 0xde, 0x11,
0xe0, 0x3f, 0xcb
};
Crypto::AESCipher::CBCMode cipher("Well Hello Friends! whf!", 192, Crypto::Intent::Encryption);
Crypto::Cipher::AESCipher::CBCMode cipher("Well Hello Friends! whf!", 192, Crypto::Cipher::Intent::Encryption);
test_it(cipher, result);
}
{
@ -239,7 +249,7 @@ void aes_cbc_test_encrypt()
0x47, 0x9f, 0xc2, 0x21, 0xe6, 0x19, 0x62, 0xc3, 0x75, 0xca, 0xab, 0x2d, 0x18, 0xa1, 0x54,
0xd1, 0x41, 0xe6
};
Crypto::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends", 256, Crypto::Intent::Encryption);
Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends", 256, Crypto::Cipher::Intent::Encryption);
test_it(cipher, result);
}
// TODO: Test non-CMS padding options
@ -250,14 +260,14 @@ void aes_cbc_test_decrypt()
auto true_value = "This is a test! This is another test!";
auto in = ByteBuffer::copy(result, result_len);
auto out = cipher.create_aligned_buffer(in.size());
auto iv = ByteBuffer::create_zeroed(Crypto::AESCipher::block_size());
auto iv = ByteBuffer::create_zeroed(Crypto::Cipher::AESCipher::block_size());
cipher.decrypt(in, out, iv);
if (out.size() != strlen(true_value)) {
FAIL(size mismatch);
printf("Expected %zu bytes but got %zu\n", strlen(true_value), out.size());
} else if (memcmp(out.data(), true_value, strlen(true_value)) != 0) {
FAIL(invalid data);
print_buffer(out, Crypto::AESCipher::block_size());
print_buffer(out, Crypto::Cipher::AESCipher::block_size());
} else
PASS;
};
@ -269,7 +279,7 @@ void aes_cbc_test_decrypt()
0x8b, 0xd3, 0x70, 0x45, 0xf0, 0x79, 0x65, 0xca, 0xb9, 0x03, 0x88, 0x72, 0x1c, 0xdd, 0xab,
0x45, 0x6b, 0x1c
};
Crypto::AESCipher::CBCMode cipher("WellHelloFriends", 128, Crypto::Intent::Decryption);
Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriends", 128, Crypto::Cipher::Intent::Decryption);
test_it(cipher, result, 48);
}
{
@ -280,7 +290,7 @@ void aes_cbc_test_decrypt()
0x68, 0x51, 0x09, 0xd7, 0x3b, 0x48, 0x1b, 0x8a, 0xd3, 0x50, 0x09, 0xba, 0xfc, 0xde, 0x11,
0xe0, 0x3f, 0xcb
};
Crypto::AESCipher::CBCMode cipher("Well Hello Friends! whf!", 192, Crypto::Intent::Decryption);
Crypto::Cipher::AESCipher::CBCMode cipher("Well Hello Friends! whf!", 192, Crypto::Cipher::Intent::Decryption);
test_it(cipher, result, 48);
}
{
@ -291,7 +301,7 @@ void aes_cbc_test_decrypt()
0x47, 0x9f, 0xc2, 0x21, 0xe6, 0x19, 0x62, 0xc3, 0x75, 0xca, 0xab, 0x2d, 0x18, 0xa1, 0x54,
0xd1, 0x41, 0xe6
};
Crypto::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends", 256, Crypto::Intent::Decryption);
Crypto::Cipher::AESCipher::CBCMode cipher("WellHelloFriendsWellHelloFriends", 256, Crypto::Cipher::Intent::Decryption);
test_it(cipher, result, 48);
}
// TODO: Test non-CMS padding options
@ -311,11 +321,11 @@ void md5_test_hash()
u8 result[] {
0xaf, 0x04, 0x3a, 0x08, 0x94, 0x38, 0x6e, 0x7f, 0xbf, 0x73, 0xe4, 0xaa, 0xf0, 0x8e, 0xee, 0x4c
};
auto digest = Crypto::MD5::hash("Well hello friends");
auto digest = Crypto::Hash::MD5::hash("Well hello friends");
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0) {
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0) {
FAIL(Invalid hash);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), -1);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
} else {
PASS;
}
@ -326,11 +336,11 @@ void md5_test_hash()
u8 result[] {
0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, 0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e
};
auto digest = Crypto::MD5::hash("");
auto digest = Crypto::Hash::MD5::hash("");
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0) {
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0) {
FAIL(Invalid hash);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), -1);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
} else {
PASS;
}
@ -340,11 +350,11 @@ void md5_test_hash()
u8 result[] {
0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8, 0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61
};
auto digest = Crypto::MD5::hash("a");
auto digest = Crypto::Hash::MD5::hash("a");
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0) {
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0) {
FAIL(Invalid hash);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), -1);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
} else {
PASS;
}
@ -354,11 +364,11 @@ void md5_test_hash()
u8 result[] {
0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00, 0x7d, 0xfb, 0x49, 0x6c, 0xca, 0x67, 0xe1, 0x3b
};
auto digest = Crypto::MD5::hash("abcdefghijklmnopqrstuvwxyz");
auto digest = Crypto::Hash::MD5::hash("abcdefghijklmnopqrstuvwxyz");
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0) {
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0) {
FAIL(Invalid hash);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), -1);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
} else {
PASS;
}
@ -368,11 +378,11 @@ void md5_test_hash()
u8 result[] {
0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55, 0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a
};
auto digest = Crypto::MD5::hash("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
auto digest = Crypto::Hash::MD5::hash("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0) {
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0) {
FAIL(Invalid hash);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::MD5::block_size()), -1);
print_buffer(ByteBuffer::wrap(digest.data, Crypto::Hash::MD5::digest_size()), -1);
} else {
PASS;
}
@ -386,21 +396,21 @@ void md5_test_consecutive_updates()
u8 result[] {
0xaf, 0x04, 0x3a, 0x08, 0x94, 0x38, 0x6e, 0x7f, 0xbf, 0x73, 0xe4, 0xaa, 0xf0, 0x8e, 0xee, 0x4c
};
Crypto::MD5 md5;
Crypto::Hash::MD5 md5;
md5.update("Well");
md5.update(" hello ");
md5.update("friends");
auto digest = md5.digest();
if (memcmp(result, digest.data, Crypto::MD5::block_size()) != 0)
if (memcmp(result, digest.data, Crypto::Hash::MD5::digest_size()) != 0)
FAIL(Invalid hash);
else
PASS;
}
{
I_TEST((MD5 Hashing | Reuse));
Crypto::MD5 md5;
Crypto::Hash::MD5 md5;
md5.update("Well");
md5.update(" hello ");
@ -412,7 +422,7 @@ void md5_test_consecutive_updates()
md5.update("friends");
auto digest1 = md5.digest();
if (memcmp(digest0.data, digest1.data, Crypto::MD5::block_size()) != 0)
if (memcmp(digest0.data, digest1.data, Crypto::Hash::MD5::block_size()) != 0)
FAIL(Cannot reuse);
else
PASS;