From c8ee017f28ce9c5f59bdae20bd2f9c0a6c4146a7 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 1 Mar 2012 16:31:20 +0000 Subject: [PATCH] - change signing func --- src/namestore/test_namestore_api_create.c | 14 ++++------- src/namestore/test_namestore_api_lookup.c | 16 ++++-------- src/namestore/test_namestore_api_put.c | 25 +++++++++++-------- src/namestore/test_namestore_api_remove.c | 15 ++++------- ...namestore_api_remove_not_existing_record.c | 12 +++------ 5 files changed, 34 insertions(+), 48 deletions(-) diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 71a15869c..5d6cc510f 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c @@ -47,7 +47,7 @@ static struct GNUNET_OS_Process *arm; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_CRYPTO_RsaSignature s_signature; +struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; struct GNUNET_NAMESTORE_RecordData *s_rd; struct GNUNET_NAMESTORE_RecordData *s_create_rd; @@ -302,13 +302,7 @@ run (void *cls, char *const *args, const char *cfgfile, char rd_ser[rd_ser_len]; GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); - /* sign */ - struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len); - sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len); - sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN); - memcpy (&sig_purpose[1], rd_ser, rd_ser_len); - GNUNET_CRYPTO_rsa_sign (privkey, sig_purpose, &s_signature); - GNUNET_free (sig_purpose); + 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); @@ -329,7 +323,9 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, s_rd, &s_signature, put_cont, s_name); + RECORDS, s_rd, s_signature, put_cont, s_name); + + GNUNET_free (s_signature); } diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index b3328123a..f6e86ac8f 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.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_CRYPTO_RsaSignature s_signature; +struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -250,13 +250,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len); - sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len); - sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN); - memcpy (&sig_purpose[1], rd_ser, rd_ser_len); - GNUNET_CRYPTO_rsa_sign (privkey, sig_purpose, &s_signature); - - GNUNET_free (sig_purpose); + 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); @@ -267,14 +261,14 @@ run (void *cls, char *const *args, const char *cfgfile, nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - - GNUNET_break (s_rd != 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, s_rd, s_signature, put_cont, s_name); + + GNUNET_free (s_signature); } diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 7310946b1..211c19696 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c @@ -24,6 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" +#include "namestore.h" #define VERBOSE GNUNET_NO @@ -42,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 *rd; +struct GNUNET_NAMESTORE_RecordData *s_rd; static int res; @@ -162,7 +163,7 @@ run (void *cls, char *const *args, const char *cfgfile, /* get public key */ GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); - struct GNUNET_CRYPTO_RsaSignature signature; + struct GNUNET_CRYPTO_RsaSignature *signature; start_arm (cfgfile); GNUNET_assert (arm != NULL); @@ -171,20 +172,24 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_break (NULL != nsh); /* create record */ - char * name = "dummy.dummy.gnunet"; - rd = create_record (RECORDS); + char * s_name = "dummy.dummy.gnunet"; + s_rd = create_record (RECORDS); - GNUNET_break (rd != NULL); - GNUNET_break (name != NULL); + signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); - GNUNET_NAMESTORE_record_put (nsh, &pubkey, name, + GNUNET_break (s_rd != NULL); + GNUNET_break (s_name != NULL); + + GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, rd, &signature, put_cont, 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 *) rd[c].data); - GNUNET_free (rd); + 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 69e9d34f3..e9b13ccf5 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -47,7 +47,7 @@ static struct GNUNET_OS_Process *arm; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_CRYPTO_RsaSignature s_signature; +struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -279,12 +279,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len); - sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len); - sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN); - memcpy (&sig_purpose[1], rd_ser, rd_ser_len); - GNUNET_CRYPTO_rsa_sign (privkey, sig_purpose, &s_signature); - GNUNET_free (sig_purpose); + 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); @@ -298,14 +293,14 @@ run (void *cls, char *const *args, const char *cfgfile, nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - - GNUNET_break (s_rd != 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, s_rd, s_signature, put_cont, s_name); + + GNUNET_free (s_signature); } 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 69e9d34f3..6818e28f3 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -47,7 +47,7 @@ static struct GNUNET_OS_Process *arm; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_CRYPTO_RsaSignature s_signature; +struct GNUNET_CRYPTO_RsaSignature *s_signature; static GNUNET_HashCode s_zone; struct GNUNET_NAMESTORE_RecordData *s_rd; static char *s_name; @@ -279,12 +279,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len); - sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len); - sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN); - memcpy (&sig_purpose[1], rd_ser, rd_ser_len); - GNUNET_CRYPTO_rsa_sign (privkey, sig_purpose, &s_signature); - GNUNET_free (sig_purpose); + 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); @@ -305,8 +300,9 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, GNUNET_TIME_absolute_get_forever(), - RECORDS, s_rd, &s_signature, put_cont, s_name); + RECORDS, s_rd, s_signature, put_cont, s_name); + GNUNET_free (s_signature); } static int -- 2.25.1