nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make AES unit tests cover the AES and the EVP case.

Browse Source
This commit is contained in:
Nick Mathewson 2011-11-21 10:42:49 -05:00
parent 9814019a54
commit fbec45c9b4
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/test_crypto.c
View File

@ -7,6 +7,7 @@
#define CRYPTO_PRIVATE #define CRYPTO_PRIVATE
#include "or.h" #include "or.h"
#include "test.h" #include "test.h"
#include "aes.h"
/** Run unit tests for Diffie-Hellman functionality. */ /** Run unit tests for Diffie-Hellman functionality. */
static void static void
@ -95,13 +96,16 @@ test_crypto_rng(void)
/** Run unit tests for our AES functionality */ /** Run unit tests for our AES functionality */
static void static void
test_crypto_aes(void) test_crypto_aes(void *arg)
{ {
char *data1 = NULL, *data2 = NULL, *data3 = NULL; char *data1 = NULL, *data2 = NULL, *data3 = NULL;
crypto_cipher_env_t *env1 = NULL, *env2 = NULL; crypto_cipher_env_t *env1 = NULL, *env2 = NULL;
int i, j; int i, j;
char *mem_op_hex_tmp=NULL; char *mem_op_hex_tmp=NULL;
int use_evp = !strcmp(arg,"evp");
evaluate_evp_for_aes(use_evp);
data1 = tor_malloc(1024); data1 = tor_malloc(1024);
data2 = tor_malloc(1024); data2 = tor_malloc(1024);
data3 = tor_malloc(1024); data3 = tor_malloc(1024);
@ -670,7 +674,7 @@ test_crypto_s2k(void)
/** Test AES-CTR encryption and decryption with IV. */ /** Test AES-CTR encryption and decryption with IV. */
static void static void
test_crypto_aes_iv(void) test_crypto_aes_iv(void *arg)
{ {
crypto_cipher_env_t *cipher; crypto_cipher_env_t *cipher;
char *plain, *encrypted1, *encrypted2, *decrypted1, *decrypted2; char *plain, *encrypted1, *encrypted2, *decrypted1, *decrypted2;
@ -678,6 +682,9 @@ test_crypto_aes_iv(void)
char key1[16], key2[16]; char key1[16], key2[16];
ssize_t encrypted_size, decrypted_size; ssize_t encrypted_size, decrypted_size;
int use_evp = !strcmp(arg,"evp");
evaluate_evp_for_aes(use_evp);
plain = tor_malloc(4095); plain = tor_malloc(4095);
encrypted1 = tor_malloc(4095 + 1 + 16); encrypted1 = tor_malloc(4095 + 1 + 16);
encrypted2 = tor_malloc(4095 + 1 + 16); encrypted2 = tor_malloc(4095 + 1 + 16);
@ -851,18 +858,36 @@ test_crypto_base32_decode(void)
; ;
} }
static void *
pass_data_setup_fn(const struct testcase_t *testcase)
{
return testcase->setup_data;
}
static int
pass_data_cleanup_fn(const struct testcase_t *testcase, void *ptr)
{
(void)ptr;
(void)testcase;
return 1;
}
static const struct testcase_setup_t pass_data = {
pass_data_setup_fn, pass_data_cleanup_fn
};
#define CRYPTO_LEGACY(name) \ #define CRYPTO_LEGACY(name) \
{ #name, legacy_test_helper, 0, &legacy_setup, test_crypto_ ## name } { #name, legacy_test_helper, 0, &legacy_setup, test_crypto_ ## name }
struct testcase_t crypto_tests[] = { struct testcase_t crypto_tests[] = {
CRYPTO_LEGACY(formats), CRYPTO_LEGACY(formats),
CRYPTO_LEGACY(rng), CRYPTO_LEGACY(rng),
CRYPTO_LEGACY(aes), { "aes_AES", test_crypto_aes, TT_FORK, &pass_data, (void*)"aes" },
{ "aes_EVP", test_crypto_aes, TT_FORK, &pass_data, (void*)"evp" },
CRYPTO_LEGACY(sha), CRYPTO_LEGACY(sha),
CRYPTO_LEGACY(pk), CRYPTO_LEGACY(pk),
CRYPTO_LEGACY(dh), CRYPTO_LEGACY(dh),
CRYPTO_LEGACY(s2k), CRYPTO_LEGACY(s2k),
CRYPTO_LEGACY(aes_iv), { "aes_iv_AES", test_crypto_aes_iv, TT_FORK, &pass_data, (void*)"aes" },
{ "aes_iv_EVP", test_crypto_aes_iv, TT_FORK, &pass_data, (void*)"evp" },
CRYPTO_LEGACY(base32_decode), CRYPTO_LEGACY(base32_decode),
END_OF_TESTCASES END_OF_TESTCASES
}; };