From: Matthias Wachs Date: Fri, 2 Mar 2012 12:08:41 +0000 (+0000) Subject: - use record_cmp X-Git-Tag: initial-import-from-subversion-38251~14494 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb9b068cf1b3783f7346d234fbbe84a3b6051524;p=oweals%2Fgnunet.git - use record_cmp --- diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index 05a3b270c..7d748447c 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.c @@ -45,7 +45,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; -struct GNUNET_NAMESTORE_RecordData *first_record; +struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -113,8 +113,8 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) int c; for (c = 0; c < RECORDS; c++) - GNUNET_free_non_null((void *) first_record[c].data); - GNUNET_free (first_record); + GNUNET_free_non_null((void *) s_rd[c].data); + GNUNET_free (s_rd); if (privkey != NULL) GNUNET_CRYPTO_rsa_key_free (privkey); @@ -169,10 +169,11 @@ void name_lookup_proc (void *cls, for (c = 0; c < RECORDS; c++) { - GNUNET_break (rd[c].expiration.abs_value == first_record[c].expiration.abs_value); - GNUNET_break (rd[c].record_type == TEST_RECORD_TYPE); - GNUNET_break (rd[c].data_size == TEST_RECORD_DATALEN); - GNUNET_break (0 == memcmp (rd[c].data, first_record[c].data, TEST_RECORD_DATALEN)); + if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp (&rd[c], &s_rd[c])) + { + GNUNET_break (0); + failed = GNUNET_YES; + } } found = GNUNET_YES; res = 0; @@ -262,14 +263,14 @@ run (void *cls, char *const *args, const char *cfgfile, /* create record */ s_name = "dummy.dummy.gnunet"; - first_record = create_record (RECORDS); + s_rd = create_record (RECORDS); - rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record); + rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd); char rd_ser[rd_ser_len]; - GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len, rd_ser); + GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, first_record, RECORDS); + s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); /* create random zone hash */ GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); @@ -280,12 +281,12 @@ run (void *cls, char *const *args, const char *cfgfile, nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - GNUNET_break (first_record != NULL); + GNUNET_break (s_rd != NULL); GNUNET_break (s_name != NULL); GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, first_record, s_signature, put_cont, s_name); + RECORDS, s_rd, s_signature, put_cont, s_name); diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 3e8db7445..f65b533b3 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c @@ -43,7 +43,7 @@ static struct GNUNET_OS_Process *arm; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_NAMESTORE_RecordData *first_record; +struct GNUNET_NAMESTORE_RecordData *s_rd; static int res; @@ -191,23 +191,23 @@ run (void *cls, char *const *args, const char *cfgfile, /* create record */ char * s_name = "dummy.dummy.gnunet"; - first_record = create_record (RECORDS); + s_rd = create_record (RECORDS); - signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, first_record, RECORDS); + signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); - GNUNET_break (first_record != NULL); + GNUNET_break (s_rd != NULL); GNUNET_break (s_name != NULL); GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, first_record, signature, put_cont, s_name); + RECORDS, s_rd, signature, put_cont, s_name); GNUNET_free (signature); int c; for (c = 0; c < RECORDS; c++) - GNUNET_free_non_null((void *) first_record[c].data); - GNUNET_free (first_record); + GNUNET_free_non_null((void *) s_rd[c].data); + GNUNET_free (s_rd); } diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 3dfc2cc5c..78a5be56a 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -49,7 +49,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; -struct GNUNET_NAMESTORE_RecordData *first_record; +struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -117,8 +117,8 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) int c; for (c = 0; c < RECORDS; c++) - GNUNET_free_non_null((void *) first_record[c].data); - GNUNET_free (first_record); + GNUNET_free_non_null((void *) s_rd[c].data); + GNUNET_free (s_rd); if (privkey != NULL) GNUNET_CRYPTO_rsa_key_free (privkey); @@ -167,11 +167,11 @@ void name_lookup_proc (void *cls, for (c = 0; c < rd_count; c++) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record [%u]: type: %u, size %u\n", c, rd[c].record_type, rd[c].data_size); - GNUNET_break (rd[c].expiration.abs_value == first_record[c+1].expiration.abs_value); - GNUNET_break (rd[c].record_type == TEST_RECORD_TYPE); - GNUNET_break (rd[c].data_size == TEST_RECORD_DATALEN); - GNUNET_break (0 == memcmp (rd[c].data, first_record[c+1].data, TEST_RECORD_DATALEN)); + if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp (&rd[c], &s_rd[c+1])) + { + GNUNET_break (0); + failed = GNUNET_YES; + } } if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey, n, rd_count, rd, signature)) @@ -226,7 +226,7 @@ put_cont (void *cls, int32_t success, const char *emsg) res = 0; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for `%s'\n", name); - GNUNET_NAMESTORE_record_remove (nsh, privkey, name, &first_record[0], &remove_cont, name); + GNUNET_NAMESTORE_record_remove (nsh, privkey, name, &s_rd[0], &remove_cont, name); } else { @@ -295,14 +295,14 @@ run (void *cls, char *const *args, const char *cfgfile, /* create record */ s_name = "dummy.dummy.gnunet"; - first_record = create_record (RECORDS); + s_rd = create_record (RECORDS); - rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record); + rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd); char rd_ser[rd_ser_len]; - GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len, rd_ser); + GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, first_record, RECORDS); + s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); /* create random zone hash */ GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); @@ -316,12 +316,12 @@ run (void *cls, char *const *args, const char *cfgfile, nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - GNUNET_break (first_record != NULL); + GNUNET_break (s_rd != NULL); GNUNET_break (s_name != NULL); GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, first_record, s_signature, put_cont, s_name); + RECORDS, s_rd, s_signature, put_cont, s_name); diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index ee6b0e5b2..4ee633598 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -49,7 +49,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; -struct GNUNET_NAMESTORE_RecordData *first_record; +struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -117,8 +117,8 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) int c; for (c = 0; c < RECORDS; c++) - GNUNET_free_non_null((void *) first_record[c].data); - GNUNET_free (first_record); + GNUNET_free_non_null((void *) s_rd[c].data); + GNUNET_free (s_rd); if (privkey != NULL) GNUNET_CRYPTO_rsa_key_free (privkey); @@ -229,14 +229,14 @@ run (void *cls, char *const *args, const char *cfgfile, /* create record */ s_name = "dummy.dummy.gnunet"; - first_record = create_record (RECORDS); + s_rd = create_record (RECORDS); - rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record); + rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd); char rd_ser[rd_ser_len]; - GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len, rd_ser); + GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, first_record, RECORDS); + s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); /* create random zone hash */ GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); @@ -250,12 +250,12 @@ run (void *cls, char *const *args, const char *cfgfile, nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - GNUNET_break (first_record != NULL); + GNUNET_break (s_rd != NULL); GNUNET_break (s_name != NULL); GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, first_record, s_signature, put_cont, s_name); + RECORDS, s_rd, s_signature, put_cont, s_name); } diff --git a/src/namestore/test_namestore_api_sign_verify.c b/src/namestore/test_namestore_api_sign_verify.c index 89e928118..084285ede 100644 --- a/src/namestore/test_namestore_api_sign_verify.c +++ b/src/namestore/test_namestore_api_sign_verify.c @@ -41,7 +41,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; struct GNUNET_CRYPTO_RsaSignature s_signature; -struct GNUNET_NAMESTORE_RecordData *first_record; +struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; static int res; @@ -84,21 +84,21 @@ run (void *cls, char *const *args, const char *cfgfile, /* create record */ s_name = "dummy.dummy.gnunet"; - first_record = create_record (RECORDS); + s_rd = create_record (RECORDS); - signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, first_record, RECORDS); + signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, s_rd, RECORDS); GNUNET_assert (signature != NULL); - res_c = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS, first_record, signature); + res_c = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS, s_rd, signature); GNUNET_break (res == GNUNET_OK); GNUNET_free (signature); - signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, first_record, RECORDS); + signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, s_rd, RECORDS); GNUNET_break (signature != NULL); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "FYI: The next warning is intended!\n"); - res_w = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS - 1, first_record, signature); + res_w = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS - 1, s_rd, signature); GNUNET_break (res_w == GNUNET_SYSERR); GNUNET_free (signature);