diff options
Diffstat (limited to 'src/util/anastasis-crypto-tvg.c')
| -rw-r--r-- | src/util/anastasis-crypto-tvg.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/src/util/anastasis-crypto-tvg.c b/src/util/anastasis-crypto-tvg.c index b426ee5..d5fc4c1 100644 --- a/src/util/anastasis-crypto-tvg.c +++ b/src/util/anastasis-crypto-tvg.c @@ -3,14 +3,14 @@ Copyright (C) 2020,2021 Anastasis SARL Anastasis is free software; you can redistribute it and/or modify it under the - terms of the GNU Lesser General Public License as published by the Free Software + terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. Anastasis is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with + You should have received a copy of the GNU General Public License along with Anastasis; see the file COPYING.GPL. If not, see <http://www.gnu.org/licenses/> */ @@ -134,24 +134,6 @@ d2j_append (json_t *arr, d, \ sizeof (*d)); -/** - * Add a number to a test vector. - * - * @param vec test vector to add to - * @param label label for the value - * @param data data to add - * @param size size of data - */ -static void -uint2j (json_t *vec, - const char *label, - unsigned int num) -{ - json_t *json = json_integer (num); - - json_object_set_new (vec, label, json); -} - static int expect_data_fixed (json_t *vec, @@ -356,7 +338,7 @@ output_vectors () { json_t *vec = vec_for (vecs, "user_identifier_derive"); - struct ANASTASIS_CRYPTO_ProviderSaltP server_salt; + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; struct ANASTASIS_CRYPTO_UserIdentifierP id; json_t *id_data = json_pack ("{s:s, s:s}", "name", @@ -364,13 +346,13 @@ output_vectors () "ssn", "AB123"); GNUNET_assert (NULL != id_data); - random_auto (&server_salt); + random_auto (&provider_salt); ANASTASIS_CRYPTO_user_identifier_derive (id_data, - &server_salt, + &provider_salt, &id); json_object_set_new (vec, "input_id_data", id_data); - d2j_auto (vec, "input_server_salt", &server_salt); + d2j_auto (vec, "input_provider_salt", &provider_salt); d2j_auto (vec, "output_id", &id); } |