diff --git a/crypto/aes.h b/crypto/aes.h index fa46ceaf..15e95433 100644 --- a/crypto/aes.h +++ b/crypto/aes.h @@ -146,7 +146,7 @@ namespace crypto { SetKey(key); SetIV(iv); - }; + } void SetKey (const AESKey& key) { m_ECBEncryption.SetKey (key); }; // 32 bytes void SetIV (const uint8_t * iv) { memcpy (m_LastBlock.buf, iv, 16); }; // 16 bytes @@ -168,6 +168,13 @@ namespace crypto CBCDecryption () { memset (m_IV.buf, 0, 16); }; + CBCDecryption(const AESKey& key, const uint8_t* iv) + : CBCDecryption() + { + SetKey(key); + SetIV(iv); + } + void SetKey (const AESKey& key) { m_ECBDecryption.SetKey (key); }; // 32 bytes void SetIV (const uint8_t * iv) { memcpy (m_IV.buf, iv, 16); }; // 16 bytes diff --git a/filelist.mk b/filelist.mk index e276c1cc..e7f29f23 100644 --- a/filelist.mk +++ b/filelist.mk @@ -30,4 +30,4 @@ LIB_SRC := $(COMMON_SRC) \ api.cpp TESTS_SRC := $(COMMON_SRC) \ - tests/Utility.cpp tests/Identity.cpp tests/Base64.cpp + tests/Utility.cpp tests/Identity.cpp tests/Base64.cpp tests/Crypto.cpp diff --git a/tests/Crypto.cpp b/tests/Crypto.cpp new file mode 100644 index 00000000..fe6d9ba3 --- /dev/null +++ b/tests/Crypto.cpp @@ -0,0 +1,204 @@ +#define BOOST_TEST_DYN_LINK + +#include +#include "crypto/aes.h" + +using namespace i2p::crypto; + +BOOST_AUTO_TEST_SUITE(CryptographyTests) + +BOOST_AUTO_TEST_CASE(XorZeroCipherBlocks) +{ + CipherBlock block = {}; + block ^= block; + const CipherBlock result = {}; + BOOST_CHECK_EQUAL_COLLECTIONS(result.buf, result.buf + 16, block.buf, block.buf + 16); +} + +BOOST_AUTO_TEST_CASE(XorSelfCipherBlocks) +{ + CipherBlock block = { + 0xc9, 0x4c, 0xaf, 0x5, 0x9c, 0x1c, 0x10, 0x1e, 0x20, 0xb3, 0x7e, + 0xcf, 0xf5, 0xbf, 0xf0, 0xd6 + }; + block ^= block; + const CipherBlock result = {}; + BOOST_CHECK_EQUAL_COLLECTIONS(result.buf, result.buf + 16, block.buf, block.buf + 16); +} + +BOOST_AUTO_TEST_CASE(XorCipherBlocks) +{ + const CipherBlock block1 = { + 0xc9, 0x4c, 0xaf, 0x5, 0x9c, 0x1c, 0x10, 0x1e, 0x20, 0xb3, 0x7e, + 0xcf, 0xf5, 0xbf, 0xf0, 0xd6 + }; + CipherBlock block2 = { + 0x2e, 0xfb, 0x26, 0xa9, 0x90, 0x3b, 0xf7, 0xc8, 0x5c, 0xfe, 0x20, + 0x23, 0x1d, 0xaf, 0x67, 0xac + }; + block2 ^= block1; + const CipherBlock result = { + 0xe7, 0xb7, 0x89, 0xac, 0xc, 0x27, 0xe7, 0xd6, 0x7c, 0x4d, 0x5e, + 0xec, 0xe8, 0x10, 0x97, 0x7a + }; + BOOST_CHECK_EQUAL_COLLECTIONS(block2.buf, block2.buf + 16, result.buf, result.buf + 16); +} + +// NIST test parameters +// see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf +struct AesCbcFixture { + + AesCbcFixture() + : cbc_encrypt(AESKey(key), iv), cbc_decrypt(AESKey(key), iv) {} + + uint8_t key[32] = { + 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, 0x2b, 0x73, + 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, + 0x3b, 0x61, 0x08, 0xd7, 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, + 0xdf, 0xf4 + }; + + uint8_t iv[16] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + }; + + CBCEncryption cbc_encrypt; + CBCDecryption cbc_decrypt; + +}; + +BOOST_FIXTURE_TEST_CASE(AesCbcSingleBlockEncrypt, AesCbcFixture) +{ + uint8_t output[16] = {}; + + const uint8_t input[] = { + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, + 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }; + const uint8_t result[] = { + 0xf5, 0x8c, 0x4c, 0x04, 0xd6, 0xe5, 0xf1, 0xba, 0x77, 0x9e, + 0xab, 0xfb, 0x5f, 0x7b, 0xfb, 0xd6 + }; + cbc_encrypt.Encrypt(input, output); + + BOOST_CHECK_EQUAL_COLLECTIONS(output, output + 16, result, result + 16); +} + +BOOST_FIXTURE_TEST_CASE(AesCbcSingleBlockDecrypt, AesCbcFixture) +{ + uint8_t output[16] = {}; + + const uint8_t input[] = { + 0xf5, 0x8c, 0x4c, 0x04, 0xd6, 0xe5, 0xf1, 0xba, 0x77, 0x9e, + 0xab, 0xfb, 0x5f, 0x7b, 0xfb, 0xd6 + }; + const uint8_t result[] = { + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, + 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }; + cbc_decrypt.Decrypt(input, output); + + BOOST_CHECK_EQUAL_COLLECTIONS(output, output + 16, result, result + 16); +} + +BOOST_FIXTURE_TEST_CASE(AesCbcEncrypt, AesCbcFixture) +{ + CipherBlock output[4] = {}; + + CipherBlock input[4] = {}; + input[0] = { + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, + 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }; + input[1] = { + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, + 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51 + }; + input[2] = { + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, + 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef + }; + input[3] = { + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, + 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 + }; + + CipherBlock result[4] = {}; + result[0] = { + 0xf5, 0x8c, 0x4c, 0x04, 0xd6, 0xe5, 0xf1, 0xba, 0x77, 0x9e, + 0xab, 0xfb, 0x5f, 0x7b, 0xfb, 0xd6 + }; + result[1] = { + 0x9c, 0xfc, 0x4e, 0x96, 0x7e, 0xdb, 0x80, 0x8d, 0x67, 0x9f, + 0x77, 0x7b, 0xc6, 0x70, 0x2c, 0x7d + }; + result[2] = { + 0x39, 0xf2, 0x33, 0x69, 0xa9, 0xd9, 0xba, 0xcf, 0xa5, 0x30, + 0xe2, 0x63, 0x04, 0x23, 0x14, 0x61 + }; + result[3] = { + 0xb2, 0xeb, 0x05, 0xe2, 0xc3, 0x9b, 0xe9, 0xfc, 0xda, 0x6c, + 0x19, 0x07, 0x8c, 0x6a, 0x9d, 0x1b + }; + cbc_encrypt.Encrypt(4, input, output); + + for(int i = 0; i < 3; ++i) { + BOOST_CHECK_EQUAL_COLLECTIONS( + output[i].buf, output[i].buf + 16, + result[i].buf, result[i].buf + 16 + ); + } +} + +BOOST_FIXTURE_TEST_CASE(AesCbcDecrypt, AesCbcFixture) +{ + CipherBlock output[4] = {}; + + CipherBlock input[4] = {}; + input[0] = { + 0xf5, 0x8c, 0x4c, 0x04, 0xd6, 0xe5, 0xf1, 0xba, 0x77, 0x9e, + 0xab, 0xfb, 0x5f, 0x7b, 0xfb, 0xd6 + }; + input[1] = { + 0x9c, 0xfc, 0x4e, 0x96, 0x7e, 0xdb, 0x80, 0x8d, 0x67, 0x9f, + 0x77, 0x7b, 0xc6, 0x70, 0x2c, 0x7d + }; + input[2] = { + 0x39, 0xf2, 0x33, 0x69, 0xa9, 0xd9, 0xba, 0xcf, 0xa5, 0x30, + 0xe2, 0x63, 0x04, 0x23, 0x14, 0x61 + }; + input[3] = { + 0xb2, 0xeb, 0x05, 0xe2, 0xc3, 0x9b, 0xe9, 0xfc, 0xda, 0x6c, + 0x19, 0x07, 0x8c, 0x6a, 0x9d, 0x1b + }; + + CipherBlock result[4] = {}; + result[0] = { + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, + 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }; + result[1] = { + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, + 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51 + }; + result[2] = { + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, + 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef + }; + result[3] = { + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, + 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 + }; + cbc_decrypt.Decrypt(4, input, output); + + for(int i = 0; i < 3; ++i) { + BOOST_CHECK_EQUAL_COLLECTIONS( + output[i].buf, output[i].buf + 16, + result[i].buf, result[i].buf + 16 + ); + } +} + + +BOOST_AUTO_TEST_SUITE_END()