[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20176 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20176 - gnunet/src/namestore |
|
Date: |
Thu, 1 Mar 2012 17:31:20 +0100 |
Author: wachs
Date: 2012-03-01 17:31:20 +0100 (Thu, 01 Mar 2012)
New Revision: 20176
Modified:
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
Log:
- change signing func
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2012-03-01 16:17:42 UTC
(rev 20175)
+++ gnunet/src/namestore/test_namestore_api_create.c 2012-03-01 16:31:20 UTC
(rev 20176)
@@ -47,7 +47,7 @@
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 @@
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,8 +323,10 @@
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
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-01 16:17:42 UTC
(rev 20175)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-01 16:31:20 UTC
(rev 20176)
@@ -43,7 +43,7 @@
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,14 +250,8 @@
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);
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd,
RECORDS);
- GNUNET_free (sig_purpose);
-
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
@@ -267,15 +261,15 @@
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);
+
}
static int
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2012-03-01 16:17:42 UTC
(rev 20175)
+++ gnunet/src/namestore/test_namestore_api_put.c 2012-03-01 16:31:20 UTC
(rev 20176)
@@ -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_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 @@
/* 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 @@
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);
}
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2012-03-01 16:17:42 UTC
(rev 20175)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2012-03-01 16:31:20 UTC
(rev 20176)
@@ -47,7 +47,7 @@
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 @@
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,15 +293,15 @@
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);
+
}
static int
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-01 16:17:42 UTC (rev 20175)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-03-01 16:31:20 UTC (rev 20176)
@@ -47,7 +47,7 @@
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 @@
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 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20176 - gnunet/src/namestore,
gnunet <=