diff options
| author | Marek Majkowski <marek@popcount.org> | 2013-06-10 20:30:57 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-12 13:02:06 -0400 |
| commit | 16d1dd134a995cf62cdbcf6c2d59da7ae09d601b (patch) | |
| tree | 5ae484f315b6b5878d8cdb436881ca4e994317ca /src/test | |
| parent | 616fd790ecacf933e6a624a14a8971d9ebf70d5c (diff) | |
| download | tor-16d1dd134a995cf62cdbcf6c2d59da7ae09d601b.tar tor-16d1dd134a995cf62cdbcf6c2d59da7ae09d601b.tar.gz | |
Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / tor_tls_evp_pkey_eq
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 1 | ||||
| -rw-r--r-- | src/test/test.c | 2 | ||||
| -rw-r--r-- | src/test/test_tortls.c | 45 |
3 files changed, 0 insertions, 48 deletions
diff --git a/src/test/include.am b/src/test/include.am index af95d4447..112d1a79d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -23,7 +23,6 @@ src_test_test_SOURCES = \ src/test/test_microdesc.c \ src/test/test_pt.c \ src/test/test_replay.c \ - src/test/test_tortls.c \ src/test/test_util.c \ src/test/test_config.c \ src/ext/tinytest.c diff --git a/src/test/test.c b/src/test/test.c index da5b4e525..a9cf899a0 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -2133,7 +2133,6 @@ extern struct testcase_t config_tests[]; extern struct testcase_t introduce_tests[]; extern struct testcase_t replaycache_tests[]; extern struct testcase_t cell_format_tests[]; -extern struct testcase_t tortls_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -2148,7 +2147,6 @@ static struct testgroup_t testgroups[] = { { "pt/", pt_tests }, { "config/", config_tests }, { "replaycache/", replaycache_tests }, - { "tortls/", tortls_tests }, { "introduce/", introduce_tests }, END_OF_GROUPS }; diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c deleted file mode 100644 index 5409ced9d..000000000 --- a/src/test/test_tortls.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2013-2013, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -#include <openssl/evp.h> - -#include "orconfig.h" -#define CRYPTO_PRIVATE -#define TORTLS_PRIVATE -#include "or.h" -#include "test.h" - -static void -test_tortls_evp_pkey_eq(void) -{ - crypto_pk_t *pk1 = NULL, *pk2 = NULL; - EVP_PKEY *evp1 = NULL, *evp2 = NULL; - - pk1 = pk_generate(0); - pk2 = pk_generate(1); - test_assert(pk1 && pk2); - - evp1 = crypto_pk_get_evp_pkey_(pk1, 0); - evp2 = crypto_pk_get_evp_pkey_(pk2, 0); - test_assert(evp1 && evp2); - - test_assert(tor_tls_evp_pkey_eq(evp1, evp2) == 0); - test_assert(tor_tls_evp_pkey_eq(evp1, evp1) == 1); - - done: - crypto_pk_free(pk1); - crypto_pk_free(pk2); - if (evp1) - EVP_PKEY_free(evp1); - if (evp2) - EVP_PKEY_free(evp2); -} - -#define TORTLS_LEGACY(name) \ - { #name, legacy_test_helper, 0, &legacy_setup, test_tortls_ ## name } - -struct testcase_t tortls_tests[] = { - TORTLS_LEGACY(evp_pkey_eq), - END_OF_TESTCASES -}; - |