/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010, 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
};
+
+/**
+ * Convert a short hash to a string (for printing debug messages).
+ * This is one of the very few calls in the entire API that is
+ * NOT reentrant!
+ *
+ * @param hc the short hash code
+ * @return string form; will be overwritten by next call to GNUNET_h2s.
+ */
+const char *
+GNUNET_short_h2s (const struct GNUNET_CRYPTO_ShortHashCode * hc)
+{
+ static struct GNUNET_CRYPTO_ShortHashAsciiEncoded ret;
+
+ GNUNET_CRYPTO_short_hash_to_enc (hc, &ret);
+ return (const char *) &ret;
+}
+
+
/**
* Calculate how many bytes we will need to serialize the given
* records.
ret = sizeof (struct NetworkRecord) * rd_count;
for (i=0;i<rd_count;i++)
{
- GNUNET_assert (ret + rd[i].data_size >= ret);
+ GNUNET_assert ((ret + rd[i].data_size) >= ret);
ret += rd[i].data_size;
}
return ret;
* Sign name and records
*
* @param key the private key
+ * @param expire block expiration
* @param name the name
* @param rd record data
* @param rd_count number of records
*/
struct GNUNET_CRYPTO_RsaSignature *
GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
+ struct GNUNET_TIME_Absolute expire,
const char *name,
const struct GNUNET_NAMESTORE_RecordData *rd,
unsigned int rd_count)
{
struct GNUNET_CRYPTO_RsaSignature *sig = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignature));
struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose;
+ struct GNUNET_TIME_AbsoluteNBO expire_nbo = GNUNET_TIME_absolute_hton(expire);
size_t rd_ser_len;
size_t name_len;
+
+ struct GNUNET_TIME_AbsoluteNBO *expire_tmp;
char * name_tmp;
char * rd_tmp;
int res;
char rd_ser[rd_ser_len];
GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
- sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len + name_len);
-
+ sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + sizeof (struct GNUNET_TIME_AbsoluteNBO) + rd_ser_len + name_len);
sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len + name_len);
sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
- name_tmp = (char *) &sig_purpose[1];
+ expire_tmp = (struct GNUNET_TIME_AbsoluteNBO *) &sig_purpose[1];
+ name_tmp = (char *) &expire_tmp[1];
rd_tmp = &name_tmp[name_len];
+ memcpy (expire_tmp, &expire_nbo, sizeof (struct GNUNET_TIME_AbsoluteNBO));
memcpy (name_tmp, name, name_len);
memcpy (rd_tmp, rd_ser, rd_ser_len);
*/
char *
GNUNET_NAMESTORE_value_to_string (uint32_t type,
- const void *data,
- size_t data_size)
+ const void *data,
+ size_t data_size)
{
+ char tmp[INET6_ADDRSTRLEN];
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
+
+ switch (type)
+ {
+ case 0:
+ return NULL;
+ case GNUNET_DNSPARSER_TYPE_A:
+ if (data_size != sizeof (struct in_addr))
+ return NULL;
+ if (NULL == inet_ntop (AF_INET, data, tmp, sizeof (tmp)))
+ return NULL;
+ return GNUNET_strdup (tmp);
+ case GNUNET_DNSPARSER_TYPE_NS:
+ return GNUNET_strndup (data, data_size);
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ return GNUNET_strndup (data, data_size);
+ case GNUNET_DNSPARSER_TYPE_SOA:
+ GNUNET_break (0);
+ // FIXME
+ return NULL;
+ case GNUNET_DNSPARSER_TYPE_PTR:
+ GNUNET_break (0);
+ // FIXME
+ return NULL;
+ case GNUNET_DNSPARSER_TYPE_MX:
+ GNUNET_break (0);
+ // FIXME
+ return NULL;
+ case GNUNET_DNSPARSER_TYPE_TXT:
+ return GNUNET_strndup (data, data_size);
+ case GNUNET_DNSPARSER_TYPE_AAAA:
+ if (data_size != sizeof (struct in6_addr))
+ return NULL;
+ if (NULL == inet_ntop (AF_INET6, data, tmp, sizeof (tmp)))
+ return NULL;
+ return GNUNET_strdup (tmp);
+ case GNUNET_NAMESTORE_TYPE_PKEY:
+ if (data_size != sizeof (struct GNUNET_ShortHashCode))
+ return NULL;
+ GNUNET_CRYPTO_short_hash_to_enc (data,
+ &enc);
+ return GNUNET_strdup (enc.short_encoding);
+ case GNUNET_NAMESTORE_TYPE_PSEU:
+ return GNUNET_strndup (data, data_size);
+ default:
+ GNUNET_break (0);
+ }
GNUNET_break (0); // not implemented
return NULL;
}
{
struct in_addr value_a;
struct in6_addr value_aaaa;
+ GNUNET_HashCode pkey;
switch (type)
{
case 0:
return GNUNET_SYSERR;
- break;
case GNUNET_DNSPARSER_TYPE_A:
if (1 != inet_pton (AF_INET, s, &value_a))
return GNUNET_SYSERR;
*data = GNUNET_malloc (sizeof (struct in_addr));
memcpy (*data, &value_a, sizeof (value_a));
*data_size = sizeof (value_a);
- break;
+ return GNUNET_OK;
case GNUNET_DNSPARSER_TYPE_NS:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
- break;
+ return GNUNET_OK;
case GNUNET_DNSPARSER_TYPE_CNAME:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
- break;
+ return GNUNET_OK;
case GNUNET_DNSPARSER_TYPE_SOA:
GNUNET_break (0);
// FIXME
case GNUNET_DNSPARSER_TYPE_TXT:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
- break;
+ return GNUNET_OK;
case GNUNET_DNSPARSER_TYPE_AAAA:
if (1 != inet_pton (AF_INET6, s, &value_aaaa))
return GNUNET_SYSERR;
*data = GNUNET_malloc (sizeof (struct in6_addr));
memcpy (*data, &value_aaaa, sizeof (value_aaaa));
- break;
+ return GNUNET_OK;
case GNUNET_NAMESTORE_TYPE_PKEY:
- GNUNET_break (0);
- // FIXME
- return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_hash_from_string (s, &pkey))
+ return GNUNET_SYSERR;
+ *data = GNUNET_malloc (sizeof (GNUNET_HashCode));
+ memcpy (*data, &pkey, sizeof (pkey));
+ *data_size = sizeof (GNUNET_HashCode);
+ return GNUNET_OK;
case GNUNET_NAMESTORE_TYPE_PSEU:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
- break;
+ return GNUNET_OK;
default:
GNUNET_break (0);
}
projects / oweals / gnunet.git / blobdiff