From f81bb47ffd5cf8a31c9eb53624058d27e37b0117 Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:26:39 +0200 Subject: [PATCH 1/9] Introduce mbed-crypto tests Add tests setup code and random bytes generator test. --- TESTS/mbed-crypto/sanity/main.cpp | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 TESTS/mbed-crypto/sanity/main.cpp diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp new file mode 100644 index 0000000000..118c2e226c --- /dev/null +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -0,0 +1,69 @@ +#include +#include "mbed.h" +#include "greentea-client/test_env.h" +#include "unity.h" +#include "utest.h" +#include "psa/crypto.h" + +using namespace utest::v1; + +void test_crypto_random(void) +{ + static const unsigned char trail[] = "don't overwrite me"; + unsigned char changed[256] = { 0 }; + unsigned char output[sizeof(changed) + sizeof(trail)]; + size_t i, bytes = sizeof(changed); + unsigned int run; + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + memcpy(output + bytes, trail, sizeof(trail)); + /* Run several times, to ensure that every output byte will be + * nonzero at least once with overwhelming probability + * (2^(-8*number_of_runs)). */ + for (run = 0; run < 10; run++) { + memset(output, 0, bytes); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generate_random(output, bytes)); + /* Check that no more than 'bytes' have been overwritten */ + TEST_ASSERT_EQUAL_UINT8_ARRAY(trail, output + bytes, sizeof(trail)); + + for (i = 0; i < bytes; i++) { + if (0 != output[i]) { + ++changed[i]; + } + } + } + + /* Check that every byte was changed to nonzero at least once. This + * validates that psa_generate_random is overwriting every byte of + * the output buffer. */ + for (i = 0; i < bytes; i++) { + TEST_ASSERT_NOT_EQUAL(0, changed[i]); + } + + mbedtls_psa_crypto_free(); +} + +utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) +{ + mbedtls_psa_crypto_free(); + greentea_case_failure_abort_handler(source, reason); + return STATUS_CONTINUE; +} + +utest::v1::status_t test_setup(const size_t number_of_cases) +{ + GREENTEA_SETUP(120, "default_auto"); + return verbose_test_setup_handler(number_of_cases); +} + +Case cases[] = { + Case("mbed-crypto random", test_crypto_random, case_failure_handler), +}; + +Specification specification(test_setup, cases); + +int main(void) +{ + return !Harness::run(specification); +} From 118f353e17d838d03bbfbf478cb4b77fd60515f9 Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:30:46 +0200 Subject: [PATCH 2/9] Add mbed-crypto asymmetric encrypt decrypt test --- TESTS/mbed-crypto/sanity/main.cpp | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 118c2e226c..49c437c2d9 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -44,6 +44,37 @@ void test_crypto_random(void) mbedtls_psa_crypto_free(); } +void test_crypto_asymmetric_encrypt_decrypt(void) +{ + psa_key_slot_t slot = 1; + psa_key_type_t key_type = PSA_KEY_TYPE_RSA_KEYPAIR; + psa_algorithm_t alg = PSA_ALG_RSA_PKCS1V15_CRYPT; + size_t key_bits = 512, got_bits = 0, output_length; + psa_key_policy_t policy; + static const unsigned char input[] = "encrypt me!"; + unsigned char encrypted[64]; + unsigned char decrypted[sizeof(input)]; + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + psa_key_policy_init(&policy); + psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generate_key(slot, key_type, key_bits, NULL, 0)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_get_key_information(slot, NULL, &got_bits)); + TEST_ASSERT_EQUAL(key_bits, got_bits); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_encrypt(slot, alg, input, sizeof(input), NULL, 0, + encrypted, sizeof(encrypted), &output_length)); + TEST_ASSERT_EQUAL(sizeof(encrypted), output_length); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_decrypt(slot, alg, encrypted, sizeof(encrypted), NULL, 0, + decrypted, sizeof(decrypted), &output_length)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); + TEST_ASSERT_EQUAL(sizeof(input), output_length); + TEST_ASSERT_EQUAL_UINT8_ARRAY(input, decrypted, output_length); + + mbedtls_psa_crypto_free(); +} + utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) { mbedtls_psa_crypto_free(); @@ -59,6 +90,7 @@ utest::v1::status_t test_setup(const size_t number_of_cases) Case cases[] = { Case("mbed-crypto random", test_crypto_random, case_failure_handler), + Case("mbed-crypto asymmetric encrypt/decrypt", test_crypto_asymmetric_encrypt_decrypt, case_failure_handler), }; Specification specification(test_setup, cases); From 29bcb2e327dd04537f66c45998c6bee153e0516e Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:33:58 +0200 Subject: [PATCH 3/9] Add mbed-crypto hash verify test --- TESTS/mbed-crypto/sanity/main.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 49c437c2d9..4213a9865f 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -75,6 +75,26 @@ void test_crypto_asymmetric_encrypt_decrypt(void) mbedtls_psa_crypto_free(); } +void test_crypto_hash_verify(void) +{ + psa_algorithm_t alg = PSA_ALG_SHA_256; + psa_hash_operation_t operation; + /* SHA-256 hash of an empty string */ + static const unsigned char hash[] = { + 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, + 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, + 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 + }; + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_setup(&operation, alg)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_verify(&operation, hash, sizeof(hash))); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_abort(&operation)); + + mbedtls_psa_crypto_free(); +} + utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) { mbedtls_psa_crypto_free(); @@ -91,6 +111,7 @@ utest::v1::status_t test_setup(const size_t number_of_cases) Case cases[] = { Case("mbed-crypto random", test_crypto_random, case_failure_handler), Case("mbed-crypto asymmetric encrypt/decrypt", test_crypto_asymmetric_encrypt_decrypt, case_failure_handler), + Case("mbed-crypto hash verify", test_crypto_hash_verify, case_failure_handler), }; Specification specification(test_setup, cases); From ff3a36abcbd52d655d32640d8efdb56a534cb45f Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:36:31 +0200 Subject: [PATCH 4/9] Add mbed-crypto symmetric cipher encrypt decrypt test --- TESTS/mbed-crypto/sanity/main.cpp | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 4213a9865f..fec4c4ac7d 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -95,6 +95,57 @@ void test_crypto_hash_verify(void) mbedtls_psa_crypto_free(); } +void test_crypto_symmetric_cipher_encrypt_decrypt(void) +{ + psa_key_slot_t slot = 1; + psa_key_type_t key_type = PSA_KEY_TYPE_AES; + psa_algorithm_t alg = PSA_ALG_CBC_NO_PADDING; + psa_cipher_operation_t operation; + psa_key_policy_t policy; + size_t output_len; + static const unsigned char key[] = { + 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c + }; + static const unsigned char input[] = { + 0xb0, 0x28, 0x9f, 0x04, 0xdc, 0x7f, 0xe2, 0x25, + 0xa2, 0xce, 0xe9, 0xd3, 0xb9, 0xbc, 0xc7, 0x2f + }; + static const unsigned char expected_encryption[] = { + 0x28, 0x8d, 0x76, 0xc0, 0xa7, 0x09, 0x50, 0x3f, + 0x87, 0x96, 0x1e, 0x96, 0x05, 0xcb, 0xb9, 0x6d + }; + unsigned char encrypted[sizeof(input)], decrypted[sizeof(input)], iv[16]; + + memset(iv, 0x2a, sizeof(iv)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + psa_key_policy_init(&policy); + psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_import_key(slot, key_type, key, sizeof(key))); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_encrypt_setup(&operation, slot, alg)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_set_iv(&operation, iv, sizeof(iv))); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_update(&operation, input, sizeof(input), + encrypted, sizeof(encrypted), &output_len)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_finish(&operation, encrypted + output_len, + sizeof(encrypted) - output_len, &output_len)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_abort(&operation)); + TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_encryption, encrypted, sizeof(expected_encryption)); + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_decrypt_setup(&operation, slot, alg)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_set_iv(&operation, iv, sizeof(iv))); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_update(&operation, encrypted, sizeof(encrypted), + decrypted, sizeof(decrypted), &output_len)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_finish(&operation, decrypted + output_len, + sizeof(decrypted) - output_len, &output_len)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_abort(&operation)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); + TEST_ASSERT_EQUAL_HEX8_ARRAY(input, decrypted, sizeof(input)); + + mbedtls_psa_crypto_free(); +} + utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) { mbedtls_psa_crypto_free(); @@ -112,6 +163,7 @@ Case cases[] = { Case("mbed-crypto random", test_crypto_random, case_failure_handler), Case("mbed-crypto asymmetric encrypt/decrypt", test_crypto_asymmetric_encrypt_decrypt, case_failure_handler), Case("mbed-crypto hash verify", test_crypto_hash_verify, case_failure_handler), + Case("mbed-crypto symmetric cipher encrypt/decrypt", test_crypto_symmetric_cipher_encrypt_decrypt, case_failure_handler), }; Specification specification(test_setup, cases); From 680d9830d12d043820b6bd9fa780fc0430d9c8a9 Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:39:14 +0200 Subject: [PATCH 5/9] Add mbed-crypto asymmetric sign verify test --- TESTS/mbed-crypto/sanity/main.cpp | 95 +++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index fec4c4ac7d..2f43d17263 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -146,6 +146,100 @@ void test_crypto_symmetric_cipher_encrypt_decrypt(void) mbedtls_psa_crypto_free(); } +void test_crypto_asymmetric_sign_verify(void) +{ + psa_key_slot_t slot = 1; + psa_key_type_t key_type = PSA_KEY_TYPE_RSA_KEYPAIR; + psa_algorithm_t alg = PSA_ALG_RSA_PKCS1V15_SIGN_RAW; + psa_key_policy_t policy; + static const unsigned char key[] = { + 0x30, 0x82, 0x02, 0x5e, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xaf, + 0x05, 0x7d, 0x39, 0x6e, 0xe8, 0x4f, 0xb7, 0x5f, 0xdb, 0xb5, 0xc2, 0xb1, + 0x3c, 0x7f, 0xe5, 0xa6, 0x54, 0xaa, 0x8a, 0xa2, 0x47, 0x0b, 0x54, 0x1e, + 0xe1, 0xfe, 0xb0, 0xb1, 0x2d, 0x25, 0xc7, 0x97, 0x11, 0x53, 0x12, 0x49, + 0xe1, 0x12, 0x96, 0x28, 0x04, 0x2d, 0xbb, 0xb6, 0xc1, 0x20, 0xd1, 0x44, + 0x35, 0x24, 0xef, 0x4c, 0x0e, 0x6e, 0x1d, 0x89, 0x56, 0xee, 0xb2, 0x07, + 0x7a, 0xf1, 0x23, 0x49, 0xdd, 0xee, 0xe5, 0x44, 0x83, 0xbc, 0x06, 0xc2, + 0xc6, 0x19, 0x48, 0xcd, 0x02, 0xb2, 0x02, 0xe7, 0x96, 0xae, 0xbd, 0x94, + 0xd3, 0xa7, 0xcb, 0xf8, 0x59, 0xc2, 0xc1, 0x81, 0x9c, 0x32, 0x4c, 0xb8, + 0x2b, 0x9c, 0xd3, 0x4e, 0xde, 0x26, 0x3a, 0x2a, 0xbf, 0xfe, 0x47, 0x33, + 0xf0, 0x77, 0x86, 0x9e, 0x86, 0x60, 0xf7, 0xd6, 0x83, 0x4d, 0xa5, 0x3d, + 0x69, 0x0e, 0xf7, 0x98, 0x5f, 0x6b, 0xc3, 0x02, 0x03, 0x01, 0x00, 0x01, + 0x02, 0x81, 0x81, 0x00, 0x87, 0x4b, 0xf0, 0xff, 0xc2, 0xf2, 0xa7, 0x1d, + 0x14, 0x67, 0x1d, 0xdd, 0x01, 0x71, 0xc9, 0x54, 0xd7, 0xfd, 0xbf, 0x50, + 0x28, 0x1e, 0x4f, 0x6d, 0x99, 0xea, 0x0e, 0x1e, 0xbc, 0xf8, 0x2f, 0xaa, + 0x58, 0xe7, 0xb5, 0x95, 0xff, 0xb2, 0x93, 0xd1, 0xab, 0xe1, 0x7f, 0x11, + 0x0b, 0x37, 0xc4, 0x8c, 0xc0, 0xf3, 0x6c, 0x37, 0xe8, 0x4d, 0x87, 0x66, + 0x21, 0xd3, 0x27, 0xf6, 0x4b, 0xbe, 0x08, 0x45, 0x7d, 0x3e, 0xc4, 0x09, + 0x8b, 0xa2, 0xfa, 0x0a, 0x31, 0x9f, 0xba, 0x41, 0x1c, 0x28, 0x41, 0xed, + 0x7b, 0xe8, 0x31, 0x96, 0xa8, 0xcd, 0xf9, 0xda, 0xa5, 0xd0, 0x06, 0x94, + 0xbc, 0x33, 0x5f, 0xc4, 0xc3, 0x22, 0x17, 0xfe, 0x04, 0x88, 0xbc, 0xe9, + 0xcb, 0x72, 0x02, 0xe5, 0x94, 0x68, 0xb1, 0xea, 0xd1, 0x19, 0x00, 0x04, + 0x77, 0xdb, 0x2c, 0xa7, 0x97, 0xfa, 0xc1, 0x9e, 0xda, 0x3f, 0x58, 0xc1, + 0x02, 0x41, 0x00, 0xe2, 0xab, 0x76, 0x08, 0x41, 0xbb, 0x9d, 0x30, 0xa8, + 0x1d, 0x22, 0x2d, 0xe1, 0xeb, 0x73, 0x81, 0xd8, 0x22, 0x14, 0x40, 0x7f, + 0x1b, 0x97, 0x5c, 0xbb, 0xfe, 0x4e, 0x1a, 0x94, 0x67, 0xfd, 0x98, 0xad, + 0xbd, 0x78, 0xf6, 0x07, 0x83, 0x6c, 0xa5, 0xbe, 0x19, 0x28, 0xb9, 0xd1, + 0x60, 0xd9, 0x7f, 0xd4, 0x5c, 0x12, 0xd6, 0xb5, 0x2e, 0x2c, 0x98, 0x71, + 0xa1, 0x74, 0xc6, 0x6b, 0x48, 0x81, 0x13, 0x02, 0x41, 0x00, 0xc5, 0xab, + 0x27, 0x60, 0x21, 0x59, 0xae, 0x7d, 0x6f, 0x20, 0xc3, 0xc2, 0xee, 0x85, + 0x1e, 0x46, 0xdc, 0x11, 0x2e, 0x68, 0x9e, 0x28, 0xd5, 0xfc, 0xbb, 0xf9, + 0x90, 0xa9, 0x9e, 0xf8, 0xa9, 0x0b, 0x8b, 0xb4, 0x4f, 0xd3, 0x64, 0x67, + 0xe7, 0xfc, 0x17, 0x89, 0xce, 0xb6, 0x63, 0xab, 0xda, 0x33, 0x86, 0x52, + 0xc3, 0xc7, 0x3f, 0x11, 0x17, 0x74, 0x90, 0x2e, 0x84, 0x05, 0x65, 0x92, + 0x70, 0x91, 0x02, 0x41, 0x00, 0xb6, 0xcd, 0xbd, 0x35, 0x4f, 0x7d, 0xf5, + 0x79, 0xa6, 0x3b, 0x48, 0xb3, 0x64, 0x3e, 0x35, 0x3b, 0x84, 0x89, 0x87, + 0x77, 0xb4, 0x8b, 0x15, 0xf9, 0x4e, 0x0b, 0xfc, 0x05, 0x67, 0xa6, 0xae, + 0x59, 0x11, 0xd5, 0x7a, 0xd6, 0x40, 0x9c, 0xf7, 0x64, 0x7b, 0xf9, 0x62, + 0x64, 0xe9, 0xbd, 0x87, 0xeb, 0x95, 0xe2, 0x63, 0xb7, 0x11, 0x0b, 0x9a, + 0x1f, 0x9f, 0x94, 0xac, 0xce, 0xd0, 0xfa, 0xfa, 0x4d, 0x02, 0x40, 0x71, + 0x19, 0x5e, 0xec, 0x37, 0xe8, 0xd2, 0x57, 0xde, 0xcf, 0xc6, 0x72, 0xb0, + 0x7a, 0xe6, 0x39, 0xf1, 0x0c, 0xbb, 0x9b, 0x0c, 0x73, 0x9d, 0x0c, 0x80, + 0x99, 0x68, 0xd6, 0x44, 0xa9, 0x4e, 0x3f, 0xd6, 0xed, 0x92, 0x87, 0x07, + 0x7a, 0x14, 0x58, 0x3f, 0x37, 0x90, 0x58, 0xf7, 0x6a, 0x8a, 0xec, 0xd4, + 0x3c, 0x62, 0xdc, 0x8c, 0x0f, 0x41, 0x76, 0x66, 0x50, 0xd7, 0x25, 0x27, + 0x5a, 0xc4, 0xa1, 0x02, 0x41, 0x00, 0xbb, 0x32, 0xd1, 0x33, 0xed, 0xc2, + 0xe0, 0x48, 0xd4, 0x63, 0x38, 0x8b, 0x7b, 0xe9, 0xcb, 0x4b, 0xe2, 0x9f, + 0x4b, 0x62, 0x50, 0xbe, 0x60, 0x3e, 0x70, 0xe3, 0x64, 0x75, 0x01, 0xc9, + 0x7d, 0xdd, 0xe2, 0x0a, 0x4e, 0x71, 0xbe, 0x95, 0xfd, 0x5e, 0x71, 0x78, + 0x4e, 0x25, 0xac, 0xa4, 0xba, 0xf2, 0x5b, 0xe5, 0x73, 0x8a, 0xae, 0x59, + 0xbb, 0xfe, 0x1c, 0x99, 0x77, 0x81, 0x44, 0x7a, 0x2b, 0x24 + }; + static const unsigned char input[] = { 0x61, 0x62, 0x63 }; + static const unsigned char expected_signature[] = { + 0x2c, 0x77, 0x44, 0x98, 0x3f, 0x02, 0x3a, 0xc7, 0xbb, 0x1c, 0x55, 0x52, + 0x9d, 0x83, 0xed, 0x11, 0xa7, 0x6a, 0x78, 0x98, 0xa1, 0xbb, 0x5c, 0xe1, + 0x91, 0x37, 0x5a, 0x4a, 0xa7, 0x49, 0x5a, 0x63, 0x3d, 0x27, 0x87, 0x9f, + 0xf5, 0x8e, 0xba, 0x5a, 0x57, 0x37, 0x1c, 0x34, 0xfe, 0xb1, 0x18, 0x0e, + 0x8b, 0x85, 0x0d, 0x55, 0x24, 0x76, 0xeb, 0xb5, 0x63, 0x4d, 0xf6, 0x20, + 0x26, 0x19, 0x92, 0xf1, 0x2e, 0xbe, 0xe9, 0x09, 0x70, 0x41, 0xdb, 0xbe, + 0xa8, 0x5a, 0x42, 0xd4, 0x5b, 0x34, 0x4b, 0xe5, 0x07, 0x3c, 0xeb, 0x77, + 0x2f, 0xfc, 0x60, 0x49, 0x54, 0xb9, 0x15, 0x8b, 0xa8, 0x1e, 0xc3, 0xdc, + 0x4d, 0x9d, 0x65, 0xe3, 0xab, 0x7a, 0xa3, 0x18, 0x16, 0x5f, 0x38, 0xc3, + 0x6f, 0x84, 0x1f, 0x1c, 0x69, 0xcb, 0x1c, 0xfa, 0x49, 0x4a, 0xa5, 0xcb, + 0xb4, 0xd6, 0xc0, 0xef, 0xba, 0xfb, 0x04, 0x3a + }; + unsigned char signature[sizeof(expected_signature)]; + size_t signature_len; + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + psa_key_policy_init(&policy); + psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY, alg); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_import_key(slot, key_type, key, sizeof(key))); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_sign(slot, alg, input, sizeof(input), + signature, sizeof(signature), &signature_len)); + TEST_ASSERT_EQUAL(sizeof(signature), signature_len); + TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_signature, signature, signature_len); + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_verify(slot, alg, input, sizeof(input), + signature, signature_len)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); + + mbedtls_psa_crypto_free(); +} + utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) { mbedtls_psa_crypto_free(); @@ -164,6 +258,7 @@ Case cases[] = { Case("mbed-crypto asymmetric encrypt/decrypt", test_crypto_asymmetric_encrypt_decrypt, case_failure_handler), Case("mbed-crypto hash verify", test_crypto_hash_verify, case_failure_handler), Case("mbed-crypto symmetric cipher encrypt/decrypt", test_crypto_symmetric_cipher_encrypt_decrypt, case_failure_handler), + Case("mbed-crypto asymmetric sign/verify", test_crypto_asymmetric_sign_verify, case_failure_handler), }; Specification specification(test_setup, cases); From c3a8659c0f8db275b86364274bcde52c41b68608 Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Thu, 15 Nov 2018 12:41:36 +0200 Subject: [PATCH 6/9] Add mbed-crypto key derivation test --- TESTS/mbed-crypto/sanity/main.cpp | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 2f43d17263..a749ca4381 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -240,6 +240,37 @@ void test_crypto_asymmetric_sign_verify(void) mbedtls_psa_crypto_free(); } +void test_crypto_key_derivation(void) +{ + psa_key_slot_t slot = 1, derived_slot = 2; + psa_algorithm_t alg = PSA_ALG_HKDF(PSA_ALG_SHA_256), derived_alg = PSA_ALG_CTR; + psa_key_type_t derived_key_type = PSA_KEY_TYPE_AES, got_type; + psa_key_policy_t policy; + psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT; + size_t key_bits = 512, derived_key_bits = 256, got_bits; + + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); + + psa_key_policy_init(&policy); + psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_DERIVE, alg); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generate_key(slot, PSA_KEY_TYPE_DERIVE, key_bits, NULL, 0)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_key_derivation(&generator, slot, alg, NULL, 0, NULL, 0, + PSA_BITS_TO_BYTES(derived_key_bits))); + psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_ENCRYPT, derived_alg); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(derived_slot, &policy)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generator_import_key(derived_slot, derived_key_type, + derived_key_bits, &generator)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_get_key_information(derived_slot, &got_type, &got_bits)); + TEST_ASSERT_EQUAL(derived_key_type, got_type); + TEST_ASSERT_EQUAL(derived_key_bits, got_bits); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generator_abort(&generator)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); + TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(derived_slot)); + + mbedtls_psa_crypto_free(); +} + utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) { mbedtls_psa_crypto_free(); @@ -259,6 +290,7 @@ Case cases[] = { Case("mbed-crypto hash verify", test_crypto_hash_verify, case_failure_handler), Case("mbed-crypto symmetric cipher encrypt/decrypt", test_crypto_symmetric_cipher_encrypt_decrypt, case_failure_handler), Case("mbed-crypto asymmetric sign/verify", test_crypto_asymmetric_sign_verify, case_failure_handler), + Case("mbed-crypto key derivation", test_crypto_key_derivation, case_failure_handler), }; Specification specification(test_setup, cases); From 7fa969f53dedce51568e176b5536536a9bfb8a5a Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Sun, 18 Nov 2018 10:47:58 +0200 Subject: [PATCH 7/9] Add license --- TESTS/mbed-crypto/sanity/main.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index a749ca4381..266592a95e 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2018, Arm Limited and affiliates + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include #include "mbed.h" #include "greentea-client/test_env.h" From 3e88dcf17734fcf262288c4c1c47ab6d51c4c1d4 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Mon, 26 Nov 2018 19:14:40 +0200 Subject: [PATCH 8/9] Test modifications * Add support for entropy injection * Move psa_crypto_init & mbedtls_psa_crypto_free to setup & teardown handlers * Skip test_crypto_asymmetric_encrypt_decrypt if RSA generation is not supported --- TESTS/mbed-crypto/sanity/main.cpp | 82 ++++++++++++++++++------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 266592a95e..c8caa6451d 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -21,9 +21,30 @@ #include "unity.h" #include "utest.h" #include "psa/crypto.h" +#include "entropy.h" +#include "entropy_poll.h" using namespace utest::v1; +#ifdef MBEDTLS_ENTROPY_NV_SEED + +#if !defined(MAX) +#define MAX(a,b) (((a)>(b))?(a):(b)) +#endif + +#define MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE \ + MAX(MBEDTLS_ENTROPY_MIN_PLATFORM, MBEDTLS_ENTROPY_BLOCK_SIZE) + +void inject_entropy() +{ + uint8_t seed[MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE] = { 0 }; + for (int i = 0; i < MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE; ++i) { + seed[i] = i; + } + mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE); +} +#endif + void test_crypto_random(void) { static const unsigned char trail[] = "don't overwrite me"; @@ -32,8 +53,6 @@ void test_crypto_random(void) size_t i, bytes = sizeof(changed); unsigned int run; - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - memcpy(output + bytes, trail, sizeof(trail)); /* Run several times, to ensure that every output byte will be * nonzero at least once with overwhelming probability @@ -57,12 +76,11 @@ void test_crypto_random(void) for (i = 0; i < bytes; i++) { TEST_ASSERT_NOT_EQUAL(0, changed[i]); } - - mbedtls_psa_crypto_free(); } void test_crypto_asymmetric_encrypt_decrypt(void) { + psa_status_t status = PSA_SUCCESS; psa_key_slot_t slot = 1; psa_key_type_t key_type = PSA_KEY_TYPE_RSA_KEYPAIR; psa_algorithm_t alg = PSA_ALG_RSA_PKCS1V15_CRYPT; @@ -72,12 +90,13 @@ void test_crypto_asymmetric_encrypt_decrypt(void) unsigned char encrypted[64]; unsigned char decrypted[sizeof(input)]; - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - psa_key_policy_init(&policy); psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generate_key(slot, key_type, key_bits, NULL, 0)); + + status = psa_generate_key(slot, key_type, key_bits, NULL, 0); + TEST_SKIP_UNLESS_MESSAGE(status != PSA_ERROR_NOT_SUPPORTED, "RSA key generation is not supported"); + TEST_ASSERT_EQUAL(PSA_SUCCESS, status); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_get_key_information(slot, NULL, &got_bits)); TEST_ASSERT_EQUAL(key_bits, got_bits); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_encrypt(slot, alg, input, sizeof(input), NULL, 0, @@ -88,8 +107,6 @@ void test_crypto_asymmetric_encrypt_decrypt(void) TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); TEST_ASSERT_EQUAL(sizeof(input), output_length); TEST_ASSERT_EQUAL_UINT8_ARRAY(input, decrypted, output_length); - - mbedtls_psa_crypto_free(); } void test_crypto_hash_verify(void) @@ -103,13 +120,9 @@ void test_crypto_hash_verify(void) 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 }; - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_setup(&operation, alg)); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_verify(&operation, hash, sizeof(hash))); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_hash_abort(&operation)); - - mbedtls_psa_crypto_free(); } void test_crypto_symmetric_cipher_encrypt_decrypt(void) @@ -135,8 +148,6 @@ void test_crypto_symmetric_cipher_encrypt_decrypt(void) unsigned char encrypted[sizeof(input)], decrypted[sizeof(input)], iv[16]; memset(iv, 0x2a, sizeof(iv)); - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - psa_key_policy_init(&policy); psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); @@ -159,8 +170,6 @@ void test_crypto_symmetric_cipher_encrypt_decrypt(void) TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_cipher_abort(&operation)); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); TEST_ASSERT_EQUAL_HEX8_ARRAY(input, decrypted, sizeof(input)); - - mbedtls_psa_crypto_free(); } void test_crypto_asymmetric_sign_verify(void) @@ -239,8 +248,6 @@ void test_crypto_asymmetric_sign_verify(void) unsigned char signature[sizeof(expected_signature)]; size_t signature_len; - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - psa_key_policy_init(&policy); psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY, alg); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); @@ -253,8 +260,6 @@ void test_crypto_asymmetric_sign_verify(void) TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_verify(slot, alg, input, sizeof(input), signature, signature_len)); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); - - mbedtls_psa_crypto_free(); } void test_crypto_key_derivation(void) @@ -266,8 +271,6 @@ void test_crypto_key_derivation(void) psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT; size_t key_bits = 512, derived_key_bits = 256, got_bits; - TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_crypto_init()); - psa_key_policy_init(&policy); psa_key_policy_set_usage(&policy, PSA_KEY_USAGE_DERIVE, alg); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_set_key_policy(slot, &policy)); @@ -284,15 +287,26 @@ void test_crypto_key_derivation(void) TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_generator_abort(&generator)); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(slot)); TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(derived_slot)); - - mbedtls_psa_crypto_free(); } -utest::v1::status_t case_failure_handler(const Case *const source, const failure_t reason) + +utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case) +{ + psa_status_t status = psa_crypto_init(); +#if defined(MBEDTLS_ENTROPY_NV_SEED) + if (status == PSA_ERROR_INSUFFICIENT_ENTROPY) { + inject_entropy(); + status = psa_crypto_init(); + } +#endif /* MBEDTLS_ENTROPY_NV_SEED */ + TEST_ASSERT_EQUAL(PSA_SUCCESS, status); + return greentea_case_setup_handler(source, index_of_case); +} + +utest::v1::status_t case_teardown_handler(const Case *const source, const size_t passed, const size_t failed, const failure_t failure) { mbedtls_psa_crypto_free(); - greentea_case_failure_abort_handler(source, reason); - return STATUS_CONTINUE; + return greentea_case_teardown_handler(source, passed, failed, failure); } utest::v1::status_t test_setup(const size_t number_of_cases) @@ -302,12 +316,12 @@ utest::v1::status_t test_setup(const size_t number_of_cases) } Case cases[] = { - Case("mbed-crypto random", test_crypto_random, case_failure_handler), - Case("mbed-crypto asymmetric encrypt/decrypt", test_crypto_asymmetric_encrypt_decrypt, case_failure_handler), - Case("mbed-crypto hash verify", test_crypto_hash_verify, case_failure_handler), - Case("mbed-crypto symmetric cipher encrypt/decrypt", test_crypto_symmetric_cipher_encrypt_decrypt, case_failure_handler), - Case("mbed-crypto asymmetric sign/verify", test_crypto_asymmetric_sign_verify, case_failure_handler), - Case("mbed-crypto key derivation", test_crypto_key_derivation, case_failure_handler), + Case("mbed-crypto random", case_setup_handler, test_crypto_random, case_teardown_handler), + Case("mbed-crypto asymmetric encrypt/decrypt", case_setup_handler, test_crypto_asymmetric_encrypt_decrypt, case_teardown_handler), + Case("mbed-crypto hash verify", case_setup_handler, test_crypto_hash_verify, case_teardown_handler), + Case("mbed-crypto symmetric cipher encrypt/decrypt", case_setup_handler, test_crypto_symmetric_cipher_encrypt_decrypt, case_teardown_handler), + Case("mbed-crypto asymmetric sign/verify", case_setup_handler, test_crypto_asymmetric_sign_verify, case_teardown_handler), + Case("mbed-crypto key derivation", case_setup_handler, test_crypto_key_derivation, case_teardown_handler), }; Specification specification(test_setup, cases); From 1431e216ad29d91abed8da499761e1535ddcded2 Mon Sep 17 00:00:00 2001 From: itayzafrir Date: Tue, 27 Nov 2018 11:56:25 +0200 Subject: [PATCH 9/9] Skip Mbed Crypto tests when when Mbed Crypto is OFF --- TESTS/mbed-crypto/sanity/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index c8caa6451d..00ae94f565 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -15,6 +15,10 @@ * limitations under the License. */ +#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C))) +#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping. +#endif + #include #include "mbed.h" #include "greentea-client/test_env.h"