[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20192 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20192 - gnunet/src/namestore |
|
Date: |
Fri, 2 Mar 2012 12:09:33 +0100 |
Author: wachs
Date: 2012-03-02 12:09:33 +0100 (Fri, 02 Mar 2012)
New Revision: 20192
Modified:
gnunet/src/namestore/namestore.h
gnunet/src/namestore/namestore_common.c
gnunet/src/namestore/test_namestore_api_create.c
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/namestore/test_namestore_api_put.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
gnunet/src/namestore/test_namestore_api_sign_verify.c
Log:
- create test
Modified: gnunet/src/namestore/namestore.h
===================================================================
--- gnunet/src/namestore/namestore.h 2012-03-02 11:07:42 UTC (rev 20191)
+++ gnunet/src/namestore/namestore.h 2012-03-02 11:09:33 UTC (rev 20192)
@@ -47,6 +47,18 @@
struct GNUNET_CRYPTO_RsaSignature *
GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey
*key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int
rd_count);
+/**
+ * Compares if two records are equal
+ *
+ * @param a record
+ * @param b record
+ *
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a,
+ const struct GNUNET_NAMESTORE_RecordData *b);
+
GNUNET_NETWORK_STRUCT_BEGIN
/**
* A GNS record serialized for network transmission.
Modified: gnunet/src/namestore/namestore_common.c
===================================================================
--- gnunet/src/namestore/namestore_common.c 2012-03-02 11:07:42 UTC (rev
20191)
+++ gnunet/src/namestore/namestore_common.c 2012-03-02 11:09:33 UTC (rev
20192)
@@ -131,7 +131,28 @@
return off;
}
+/**
+ * Compares if two records are equal
+ *
+ * @param a record
+ * @param b record
+ *
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a,
+ const struct GNUNET_NAMESTORE_RecordData *b)
+{
+ if ((a->record_type == b->record_type) &&
+ (a->expiration.abs_value == b->expiration.abs_value) &&
+ (a->data_size == b->data_size) &&
+ (0 == memcmp (a->data, b->data, a->data_size)))
+ return GNUNET_YES;
+ else
+ return GNUNET_NO;
+}
+
/**
* Deserialize the given records to the given destination.
*
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2012-03-02 11:07:42 UTC
(rev 20191)
+++ gnunet/src/namestore/test_namestore_api_create.c 2012-03-02 11:09:33 UTC
(rev 20192)
@@ -50,8 +50,8 @@
struct GNUNET_CRYPTO_RsaSignature *s_signature;
struct GNUNET_CRYPTO_RsaSignature *s_signature_updated;
static GNUNET_HashCode s_zone;
-struct GNUNET_NAMESTORE_RecordData *s_rd;
-struct GNUNET_NAMESTORE_RecordData *s_create_rd;
+struct GNUNET_NAMESTORE_RecordData *s_first_record;
+struct GNUNET_NAMESTORE_RecordData *s_second_record;
static char *s_name;
@@ -117,11 +117,9 @@
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
- int c;
- for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
- //GNUNET_free (s_create_rd);
+ GNUNET_free ((void *) s_first_record->data);
+ GNUNET_free (s_first_record);
+ GNUNET_free_non_null (s_second_record);
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -135,7 +133,7 @@
stop_arm();
}
-void name_lookup_proc (void *cls,
+void name_lookup_second_proc (void *cls,
const struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
struct GNUNET_TIME_Absolute expire,
const char *n,
@@ -162,6 +160,105 @@
failed = GNUNET_YES;
}
+ if (2 != rd_count)
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+
+ for (c = 0; c < rd_count; c++)
+ {
+ if ((GNUNET_NO == GNUNET_NAMESTORE_records_cmp(&rd[c], s_first_record))
&&
+ (GNUNET_NO == GNUNET_NAMESTORE_records_cmp(&rd[c], s_second_record)))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+ }
+
+ if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey, n, rd_count,
rd, signature))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+
+ struct GNUNET_NAMESTORE_RecordData rd_new[2];
+ rd_new[0] = *s_first_record;
+ rd_new[1] = *s_second_record;
+ s_signature_updated = GNUNET_NAMESTORE_create_signature(privkey, s_name,
rd_new, 2);
+
+ if (0 != memcmp (s_signature_updated, signature, sizeof (struct
GNUNET_CRYPTO_RsaSignature)))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+
+ found = GNUNET_YES;
+ if (failed == GNUNET_NO)
+ res = 0;
+ else
+ res = 1;
+ }
+ else
+ {
+ if (found != GNUNET_YES)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to lookup records for name
`%s'\n", s_name);
+ res = 1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Lookup done for name %s'\n", s_name);
+ }
+ GNUNET_SCHEDULER_add_now(&end, NULL);
+}
+
+
+void
+create_second_cont (void *cls, int32_t success, const char *emsg)
+{
+ char *name = cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Create second record for `%s': %s\n",
name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+ if (success == GNUNET_OK)
+ {
+ res = 0;
+ GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, name, 0,
&name_lookup_second_proc, name);
+ }
+ else
+ {
+ res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name
`%s'\n", name);
+ GNUNET_SCHEDULER_add_now(&end, NULL);
+ }
+
+}
+
+void name_lookup_initial_proc (void *cls,
+ const struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ struct GNUNET_TIME_Absolute expire,
+ const char *n,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+ char * name = cls;
+ static int found = GNUNET_NO;
+ int failed = GNUNET_NO;
+ int c;
+
+ if (n != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking returned results\n");
+ if (0 != memcmp (zone_key, &pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+
+ if (0 != strcmp(n, s_name))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
+
if (RECORDS != rd_count)
{
GNUNET_break (0);
@@ -170,10 +267,11 @@
for (c = 0; c < RECORDS; c++)
{
- GNUNET_break (rd[c].expiration.abs_value ==
s_rd[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, s_rd[c].data,
TEST_RECORD_DATALEN));
+ if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp(&rd[c],
&s_first_record[c]))
+ {
+ GNUNET_break (0);
+ failed = GNUNET_YES;
+ }
}
if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey, n, rd_count,
rd, signature))
@@ -193,6 +291,18 @@
res = 0;
else
res = 1;
+
+ /* create a second record */
+ s_second_record = GNUNET_malloc(sizeof (struct
GNUNET_NAMESTORE_RecordData) + TEST_CREATE_RECORD_DATALEN);
+ s_second_record->expiration = GNUNET_TIME_absolute_get_forever();
+ s_second_record->record_type = TEST_CREATE_RECORD_TYPE;
+ s_second_record->flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ s_second_record->data = &s_second_record[1];
+ s_second_record->data_size = TEST_CREATE_RECORD_DATALEN;
+ memset ((char *) s_second_record->data, TEST_CREATE_RECORD_DATA,
TEST_CREATE_RECORD_DATALEN);
+
+ GNUNET_NAMESTORE_record_create (nsh, privkey, name, s_second_record,
&create_second_cont, name);
+
}
else
{
@@ -202,19 +312,20 @@
res = 1;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Lookup done for name %s'\n", s_name);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
- GNUNET_SCHEDULER_add_now(&end, NULL);
}
void
-create_cont (void *cls, int32_t success, const char *emsg)
+create_first_cont (void *cls, int32_t success, const char *emsg)
{
char *name = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Create record for `%s': %s\n", name,
(success == GNUNET_OK) ? "SUCCESS" : "FAIL");
if (success == GNUNET_OK)
{
res = 0;
- GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, name, 0, &name_lookup_proc,
name);
+ /* check if record was created correct */
+ GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, name, 0,
&name_lookup_initial_proc, name);
}
else
{
@@ -232,16 +343,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name store added record for `%s':
%s\n", name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
if (success == GNUNET_OK)
{
- res = 0;
- s_create_rd = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_RecordData) +
TEST_CREATE_RECORD_DATALEN);
- s_create_rd->expiration = GNUNET_TIME_absolute_get_forever();
- s_create_rd->record_type = TEST_CREATE_RECORD_TYPE;
- s_create_rd->flags = GNUNET_NAMESTORE_RF_AUTHORITY;
- s_create_rd->data = &s_create_rd[1];
- s_create_rd->data_size = TEST_CREATE_RECORD_DATALEN;
- memset ((char *) s_create_rd->data, TEST_CREATE_RECORD_DATA,
TEST_CREATE_RECORD_DATALEN);
- GNUNET_NAMESTORE_record_create (nsh, privkey, name, s_create_rd,
&create_cont, name);
}
else
{
@@ -305,13 +407,13 @@
/* create record */
s_name = "dummy.dummy.gnunet";
- s_rd = create_record (1);
+ s_first_record = create_record (1);
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, s_rd);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, s_first_record);
char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(1, s_rd, rd_ser_len, rd_ser);
+ GNUNET_NAMESTORE_records_serialize(1, s_first_record, rd_ser_len, rd_ser);
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, 1);
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name,
s_first_record, 1);
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
@@ -324,11 +426,11 @@
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- GNUNET_break (s_rd != NULL);
+ GNUNET_break (s_first_record != NULL);
GNUNET_break (s_name != NULL);
/* create initial record */
- GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_rd, &create_cont,
s_name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_first_cont, s_name);
}
static int
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-02 11:07:42 UTC
(rev 20191)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-02 11:09:33 UTC
(rev 20192)
@@ -45,7 +45,7 @@
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
struct GNUNET_CRYPTO_RsaSignature *s_signature;
static GNUNET_HashCode s_zone;
-struct GNUNET_NAMESTORE_RecordData *s_rd;
+struct GNUNET_NAMESTORE_RecordData *first_record;
static char *s_name;
@@ -113,8 +113,8 @@
int c;
for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
+ GNUNET_free_non_null((void *) first_record[c].data);
+ GNUNET_free (first_record);
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -169,10 +169,10 @@
for (c = 0; c < RECORDS; c++)
{
- GNUNET_break (rd[c].expiration.abs_value ==
s_rd[c].expiration.abs_value);
+ 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, s_rd[c].data,
TEST_RECORD_DATALEN));
+ GNUNET_break (0 == memcmp (rd[c].data, first_record[c].data,
TEST_RECORD_DATALEN));
}
found = GNUNET_YES;
res = 0;
@@ -262,14 +262,14 @@
/* create record */
s_name = "dummy.dummy.gnunet";
- s_rd = create_record (RECORDS);
+ first_record = create_record (RECORDS);
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record);
char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
+ GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len,
rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd,
RECORDS);
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name,
first_record, RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
@@ -280,12 +280,12 @@
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- GNUNET_break (s_rd != NULL);
+ GNUNET_break (first_record != NULL);
GNUNET_break (s_name != NULL);
GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
GNUNET_TIME_absolute_get_forever(),
- RECORDS, s_rd, s_signature, put_cont, s_name);
+ RECORDS, first_record, s_signature, put_cont,
s_name);
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2012-03-02 11:07:42 UTC
(rev 20191)
+++ gnunet/src/namestore/test_namestore_api_put.c 2012-03-02 11:09:33 UTC
(rev 20192)
@@ -43,7 +43,7 @@
static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
-struct GNUNET_NAMESTORE_RecordData *s_rd;
+struct GNUNET_NAMESTORE_RecordData *first_record;
static int res;
@@ -191,23 +191,23 @@
/* create record */
char * s_name = "dummy.dummy.gnunet";
- s_rd = create_record (RECORDS);
+ first_record = create_record (RECORDS);
- signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd,
RECORDS);
+ signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, first_record,
RECORDS);
- GNUNET_break (s_rd != NULL);
+ GNUNET_break (first_record != NULL);
GNUNET_break (s_name != NULL);
GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
GNUNET_TIME_absolute_get_forever(),
- RECORDS, s_rd, signature, put_cont, s_name);
+ RECORDS, first_record, signature, put_cont,
s_name);
GNUNET_free (signature);
int c;
for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
+ GNUNET_free_non_null((void *) first_record[c].data);
+ GNUNET_free (first_record);
}
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2012-03-02 11:07:42 UTC
(rev 20191)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2012-03-02 11:09:33 UTC
(rev 20192)
@@ -49,7 +49,7 @@
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
struct GNUNET_CRYPTO_RsaSignature *s_signature;
static GNUNET_HashCode s_zone;
-struct GNUNET_NAMESTORE_RecordData *s_rd;
+struct GNUNET_NAMESTORE_RecordData *first_record;
static char *s_name;
@@ -117,8 +117,8 @@
int c;
for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
+ GNUNET_free_non_null((void *) first_record[c].data);
+ GNUNET_free (first_record);
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -168,10 +168,10 @@
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 ==
s_rd[c+1].expiration.abs_value);
+ 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, s_rd[c+1].data,
TEST_RECORD_DATALEN));
+ GNUNET_break (0 == memcmp (rd[c].data, first_record[c+1].data,
TEST_RECORD_DATALEN));
}
if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey, n, rd_count,
rd, signature))
@@ -226,7 +226,7 @@
res = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for `%s'\n", name);
- GNUNET_NAMESTORE_record_remove (nsh, privkey, name, &s_rd[0],
&remove_cont, name);
+ GNUNET_NAMESTORE_record_remove (nsh, privkey, name, &first_record[0],
&remove_cont, name);
}
else
{
@@ -295,14 +295,14 @@
/* create record */
s_name = "dummy.dummy.gnunet";
- s_rd = create_record (RECORDS);
+ first_record = create_record (RECORDS);
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record);
char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
+ GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len,
rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd,
RECORDS);
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name,
first_record, RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
@@ -316,12 +316,12 @@
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- GNUNET_break (s_rd != NULL);
+ GNUNET_break (first_record != NULL);
GNUNET_break (s_name != NULL);
GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
GNUNET_TIME_absolute_get_forever(),
- RECORDS, s_rd, s_signature, put_cont, s_name);
+ RECORDS, first_record, s_signature, put_cont,
s_name);
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-03-02 11:07:42 UTC (rev 20191)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-03-02 11:09:33 UTC (rev 20192)
@@ -49,7 +49,7 @@
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
struct GNUNET_CRYPTO_RsaSignature *s_signature;
static GNUNET_HashCode s_zone;
-struct GNUNET_NAMESTORE_RecordData *s_rd;
+struct GNUNET_NAMESTORE_RecordData *first_record;
static char *s_name;
@@ -117,8 +117,8 @@
int c;
for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
+ GNUNET_free_non_null((void *) first_record[c].data);
+ GNUNET_free (first_record);
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
@@ -229,14 +229,14 @@
/* create record */
s_name = "dummy.dummy.gnunet";
- s_rd = create_record (RECORDS);
+ first_record = create_record (RECORDS);
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, first_record);
char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
+ GNUNET_NAMESTORE_records_serialize(RECORDS, first_record, rd_ser_len,
rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd,
RECORDS);
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name,
first_record, RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
@@ -250,12 +250,12 @@
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- GNUNET_break (s_rd != NULL);
+ GNUNET_break (first_record != NULL);
GNUNET_break (s_name != NULL);
GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
GNUNET_TIME_absolute_get_forever(),
- RECORDS, s_rd, s_signature, put_cont, s_name);
+ RECORDS, first_record, s_signature, put_cont,
s_name);
}
Modified: gnunet/src/namestore/test_namestore_api_sign_verify.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_sign_verify.c 2012-03-02
11:07:42 UTC (rev 20191)
+++ gnunet/src/namestore/test_namestore_api_sign_verify.c 2012-03-02
11:09:33 UTC (rev 20192)
@@ -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 *s_rd;
+struct GNUNET_NAMESTORE_RecordData *first_record;
static char *s_name;
static int res;
@@ -84,21 +84,21 @@
/* create record */
s_name = "dummy.dummy.gnunet";
- s_rd = create_record (RECORDS);
+ first_record = create_record (RECORDS);
- signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, s_rd,
RECORDS);
+ signature = GNUNET_NAMESTORE_create_signature (privkey, s_name,
first_record, RECORDS);
GNUNET_assert (signature != NULL);
- res_c = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS, s_rd,
signature);
+ res_c = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS,
first_record, signature);
GNUNET_break (res == GNUNET_OK);
GNUNET_free (signature);
- signature = GNUNET_NAMESTORE_create_signature (privkey, s_name, s_rd,
RECORDS);
+ signature = GNUNET_NAMESTORE_create_signature (privkey, s_name,
first_record, 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,
s_rd, signature);
+ res_w = GNUNET_NAMESTORE_verify_signature(&pubkey, s_name, RECORDS - 1,
first_record, signature);
GNUNET_break (res_w == GNUNET_SYSERR);
GNUNET_free (signature);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20192 - gnunet/src/namestore,
gnunet <=