/*
This file is part of GNUnet.
- (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2003--2013 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
* into HashMaps. The key may change between FS implementations.
*
* @param uri uri to convert to a unique key
- * @param key wherer to store the unique key
+ * @param key where to store the unique key
*/
void
-GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, GNUNET_HashCode * key)
+GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
+ struct GNUNET_HashCode *key)
{
switch (uri->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
*key = uri->data.chk.chk.query;
return;
- case sks:
+ case GNUNET_FS_URI_SKS:
GNUNET_CRYPTO_hash (uri->data.sks.identifier,
strlen (uri->data.sks.identifier), key);
break;
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (uri->data.ksk.keywordCount > 0)
GNUNET_CRYPTO_hash (uri->data.ksk.keywords[0],
strlen (uri->data.ksk.keywords[0]), key);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
GNUNET_CRYPTO_hash (&uri->data.loc.fi,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
key);
break;
default:
- memset (key, 0, sizeof (GNUNET_HashCode));
+ memset (key, 0, sizeof (struct GNUNET_HashCode));
break;
}
}
char **keywords;
unsigned int keywordCount;
- if ((uri == NULL) || (uri->type != ksk))
+ if ((NULL == uri) || (GNUNET_FS_URI_KSK != uri->type))
{
GNUNET_break (0);
return NULL;
{
if (out[rpos] == '%')
{
- if (1 != sscanf (&out[rpos + 1], "%2X", &hx))
+ if (1 != SSCANF (&out[rpos + 1], "%2X", &hx))
{
GNUNET_free (out);
- *emsg = GNUNET_strdup (_("`%' must be followed by HEX number"));
+ *emsg = GNUNET_strdup (_(/* xgettext:no-c-format */
+ "`%' must be followed by HEX number"));
return NULL;
}
rpos += 3;
char *dup;
int saw_quote;
- GNUNET_assert (s != NULL);
+ GNUNET_assert (NULL != s);
slen = strlen (s);
pos = strlen (GNUNET_FS_URI_KSK_PREFIX);
if ((slen <= pos) || (0 != strncmp (s, GNUNET_FS_URI_KSK_PREFIX, pos)))
goto CLEANUP;
GNUNET_assert (max == 0);
GNUNET_free (dup);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ret->data.ksk.keywordCount = iret;
ret->data.ksk.keywords = keywords;
return ret;
uri_sks_parse (const char *s, char **emsg)
{
struct GNUNET_FS_Uri *ret;
- GNUNET_HashCode namespace;
- char *identifier;
- unsigned int pos;
- size_t slen;
- char enc[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)];
+ struct GNUNET_CRYPTO_EccPublicKey ns;
+ size_t pos;
+ char *end;
GNUNET_assert (s != NULL);
- slen = strlen (s);
pos = strlen (GNUNET_FS_URI_SKS_PREFIX);
- if ((slen <= pos) || (0 != strncmp (s, GNUNET_FS_URI_SKS_PREFIX, pos)))
+ if ((strlen (s) <= pos) || (0 != strncmp (s, GNUNET_FS_URI_SKS_PREFIX, pos)))
return NULL; /* not an SKS URI */
- if ((slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '/'))
+ end = strchr (&s[pos], '/');
+ if ( (NULL == end) ||
+ (GNUNET_OK !=
+ GNUNET_STRINGS_string_to_data (&s[pos],
+ end - &s[pos],
+ &ns,
+ sizeof (ns))) )
{
*emsg = GNUNET_strdup (_("Malformed SKS URI"));
- return NULL;
- }
- memcpy (enc, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded));
- enc[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0';
- if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (enc, &namespace))
- {
- *emsg = GNUNET_strdup (_("Malformed SKS URI"));
- return NULL;
+ return NULL; /* malformed */
}
- identifier =
- GNUNET_strdup (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)]);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = sks;
- ret->data.sks.namespace = namespace;
- ret->data.sks.identifier = identifier;
+ end++; /* skip over '/' */
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_SKS;
+ ret->data.sks.ns = ns;
+ ret->data.sks.identifier = GNUNET_strdup (end);
return ret;
}
return NULL;
}
fi.file_length = GNUNET_htonll (flen);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = chk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_CHK;
ret->data.chk = fi;
return ret;
}
}
+GNUNET_NETWORK_STRUCT_BEGIN
/**
- * Structure that defines how the
- * contents of a location URI must be
- * assembled in memory to create or
- * verify the signature of a location
+ * Structure that defines how the contents of a location URI must be
+ * assembled in memory to create or verify the signature of a location
* URI.
*/
struct LocUriAssembly
{
- struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+ /**
+ * What is being signed (rest of this struct).
+ */
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ /**
+ * Expiration time of the offer.
+ */
struct GNUNET_TIME_AbsoluteNBO exptime;
+ /**
+ * File being offered.
+ */
struct FileIdentifier fi;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer;
+ /**
+ * Peer offering the file.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey peer;
};
+GNUNET_NETWORK_STRUCT_END
#define GNUNET_FS_URI_LOC_PREFIX GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX
unsigned long long exptime;
unsigned long long flen;
struct GNUNET_TIME_Absolute et;
- struct GNUNET_CRYPTO_RsaSignature sig;
+ struct GNUNET_CRYPTO_EccSignature sig;
struct LocUriAssembly ass;
int ret;
size_t slen;
SSCANF (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2],
"%llu", &flen)))
{
- *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ *emsg = GNUNET_strdup (_("LOC URI malformed"));
return NULL;
}
ass.fi.file_length = GNUNET_htonll (flen);
npos++;
if (s[npos] == '\0')
{
- *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ *emsg = GNUNET_strdup (_("LOC URI malformed"));
goto ERR;
}
npos++;
ret =
enc2bin (&s[npos], &ass.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey));
if (ret == -1)
{
*emsg =
- GNUNET_strdup (_("SKS URI malformed (could not decode public key)"));
+ GNUNET_strdup (_("LOC URI malformed (could not decode public key)"));
goto ERR;
}
npos += ret;
*emsg = GNUNET_strdup (_("SKS URI malformed (could not find signature)"));
goto ERR;
}
- ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_RsaSignature));
+ ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_EccSignature));
if (ret == -1)
{
*emsg = GNUNET_strdup (_("SKS URI malformed (could not decode signature)"));
}
ass.purpose.size = htonl (sizeof (struct LocUriAssembly));
ass.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
- et.abs_value = exptime;
+ et.abs_value_us = exptime * 1000LL * 1000LL;
ass.exptime = GNUNET_TIME_absolute_hton (et);
if (GNUNET_OK !=
- GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
+ GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
&ass.purpose, &sig, &ass.peer))
{
*emsg =
GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
goto ERR;
}
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = loc;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = ass.fi;
uri->data.loc.peer = ass.peer;
uri->data.loc.expirationTime = et;
GNUNET_assert (uri != NULL);
switch (uri->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
for (i = 0; i < uri->data.ksk.keywordCount; i++)
GNUNET_free (uri->data.ksk.keywords[i]);
GNUNET_array_grow (uri->data.ksk.keywords, uri->data.ksk.keywordCount, 0);
break;
- case sks:
+ case GNUNET_FS_URI_SKS:
GNUNET_free (uri->data.sks.identifier);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
break;
default:
/* do nothing */
unsigned int
GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri *uri)
{
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return 0;
return uri->data.ksk.keywordCount;
}
unsigned int i;
char *keyword;
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return -1;
if (iterator == NULL)
return uri->data.ksk.keywordCount;
const char *old;
char *n;
- GNUNET_assert (uri->type == ksk);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_KSK);
for (i = 0; i < uri->data.ksk.keywordCount; i++)
{
old = uri->data.ksk.keywords[i];
unsigned int i;
char *old;
- GNUNET_assert (uri->type == ksk);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_KSK);
for (i = 0; i < uri->data.ksk.keywordCount; i++)
{
old = uri->data.ksk.keywords[i];
GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
struct GNUNET_PeerIdentity *peer)
{
- if (uri->type != loc)
+ if (uri->type != GNUNET_FS_URI_LOC)
return GNUNET_SYSERR;
GNUNET_CRYPTO_hash (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
&peer->hashPubKey);
return GNUNET_OK;
}
struct GNUNET_TIME_Absolute
GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri)
{
- GNUNET_assert (uri->type == loc);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_LOC);
return uri->data.loc.expirationTime;
}
{
struct GNUNET_FS_Uri *ret;
- if (uri->type != loc)
+ if (uri->type != GNUNET_FS_URI_LOC)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = chk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_CHK;
ret->data.chk = uri->data.loc.fi;
return ret;
}
struct GNUNET_TIME_Absolute expiration_time)
{
struct GNUNET_FS_Uri *uri;
- struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+ struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
+ struct GNUNET_CRYPTO_EccPublicKey my_public_key;
char *keyfile;
struct LocUriAssembly ass;
+ struct GNUNET_TIME_Absolute et;
- if (baseUri->type != chk)
+ if (baseUri->type != GNUNET_FS_URI_CHK)
return NULL;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", "PRIVATE_KEY",
&keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Lacking key configuration settings.\n"));
return NULL;
}
- my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- if (my_private_key == NULL)
+ if (NULL == (my_private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access hostkey file `%s'.\n"), keyfile);
return NULL;
}
GNUNET_free (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
+ /* we round expiration time to full seconds for SKS URIs */
+ et.abs_value_us = (expiration_time.abs_value_us / 1000000LL) * 1000000LL;
+ GNUNET_CRYPTO_ecc_key_get_public (my_private_key, &my_public_key);
ass.purpose.size = htonl (sizeof (struct LocUriAssembly));
ass.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
- ass.exptime = GNUNET_TIME_absolute_hton (expiration_time);
+ ass.exptime = GNUNET_TIME_absolute_hton (et);
ass.fi = baseUri->data.chk;
ass.peer = my_public_key;
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = loc;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = baseUri->data.chk;
- uri->data.loc.expirationTime = expiration_time;
+ uri->data.loc.expirationTime = et;
uri->data.loc.peer = my_public_key;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_sign (my_private_key, &ass.purpose,
+ GNUNET_CRYPTO_ecc_sign (my_private_key, &ass.purpose,
&uri->data.loc.contentSignature));
- GNUNET_CRYPTO_rsa_key_free (my_private_key);
+ GNUNET_CRYPTO_ecc_key_free (my_private_key);
return uri;
}
-/**
- * Create an SKS URI from a namespace and an identifier.
- *
- * @param ns namespace
- * @param id identifier
- * @param emsg where to store an error message
- * @return an FS URI for the given namespace and identifier
- */
-struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
- char **emsg)
-{
- struct GNUNET_FS_Uri *ns_uri;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pk;
-
- ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ns_uri->type = sks;
- GNUNET_CRYPTO_rsa_key_get_public (ns->key, &pk);
- GNUNET_CRYPTO_hash (&pk, sizeof (pk), &ns_uri->data.sks.namespace);
- ns_uri->data.sks.identifier = GNUNET_strdup (id);
- return ns_uri;
-}
-
-
/**
* Create an SKS URI from a namespace ID and an identifier.
*
- * @param nsid namespace ID
+ * @param ns namespace ID
* @param id identifier
* @return an FS URI for the given namespace and identifier
*/
struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id)
+GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicKey *ns,
+ const char *id)
{
struct GNUNET_FS_Uri *ns_uri;
- ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ns_uri->type = sks;
- ns_uri->data.sks.namespace = *nsid;
+ ns_uri = GNUNET_new (struct GNUNET_FS_Uri);
+ ns_uri->type = GNUNET_FS_URI_SKS;
+ ns_uri->data.sks.ns = *ns;
ns_uri->data.sks.identifier = GNUNET_strdup (id);
return ns_uri;
}
return GNUNET_FS_uri_dup (u2);
if (u2 == NULL)
return GNUNET_FS_uri_dup (u1);
- if ((u1->type != ksk) || (u2->type != ksk))
+ if ((u1->type != GNUNET_FS_URI_KSK) || (u2->type != GNUNET_FS_URI_KSK))
{
GNUNET_break (0);
return NULL;
if (0 == found)
kl[kc++] = GNUNET_strdup (kp);
}
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ret->data.ksk.keywordCount = kc;
ret->data.ksk.keywords = kl;
return ret;
if (uri == NULL)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
memcpy (ret, uri, sizeof (struct GNUNET_FS_Uri));
switch (ret->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (ret->data.ksk.keywordCount >=
GNUNET_MAX_MALLOC_CHECKED / sizeof (char *))
{
else
ret->data.ksk.keywords = NULL; /* just to be sure */
break;
- case sks:
+ case GNUNET_FS_URI_SKS:
ret->data.sks.identifier = GNUNET_strdup (uri->data.sks.identifier);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
break;
default:
break;
&& (NULL != (uri = GNUNET_FS_uri_parse (argv[0], &emsg))))
return uri;
GNUNET_free_non_null (emsg);
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = ksk;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_KSK;
uri->data.ksk.keywordCount = argc;
uri->data.ksk.keywords = GNUNET_malloc (argc * sizeof (char *));
for (i = 0; i < argc; i++)
return GNUNET_NO;
switch (u1->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
if (0 ==
memcmp (&u1->data.chk, &u2->data.chk, sizeof (struct FileIdentifier)))
return GNUNET_YES;
return GNUNET_NO;
- case sks:
+ case GNUNET_FS_URI_SKS:
if ((0 ==
- memcmp (&u1->data.sks.namespace, &u2->data.sks.namespace,
- sizeof (GNUNET_HashCode))) &&
+ memcmp (&u1->data.sks.ns, &u2->data.sks.ns,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey))) &&
(0 == strcmp (u1->data.sks.identifier, u2->data.sks.identifier)))
return GNUNET_YES;
return GNUNET_NO;
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (u1->data.ksk.keywordCount != u2->data.ksk.keywordCount)
return GNUNET_NO;
for (i = 0; i < u1->data.ksk.keywordCount; i++)
return GNUNET_NO;
}
return GNUNET_YES;
- case loc:
+ case GNUNET_FS_URI_LOC:
if (memcmp
(&u1->data.loc, &u2->data.loc,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
sizeof (struct GNUNET_TIME_Absolute) + sizeof (unsigned short) +
sizeof (unsigned short)) != 0)
return GNUNET_NO;
int
GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == sks;
+ return uri->type == GNUNET_FS_URI_SKS;
}
* namespace URI.
*
* @param uri the uri to get the namespace ID from
- * @param nsid where to store the ID of the namespace
+ * @param pseudonym where to store the ID of the namespace
* @return GNUNET_OK on success
*/
int
GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
- GNUNET_HashCode * nsid)
+ struct GNUNET_CRYPTO_EccPublicKey *pseudonym)
{
if (!GNUNET_FS_uri_test_sks (uri))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- *nsid = uri->data.sks.namespace;
+ *pseudonym = uri->data.sks.ns;
return GNUNET_OK;
}
const struct GNUNET_FS_Uri *uri)
{
char *ret;
- char *name, *unique_name;
- int getinfo_result;
+ char *name;
+ char *unique_name;
- if (uri->type != sks)
+ if (uri->type != GNUNET_FS_URI_SKS)
return NULL;
- getinfo_result = GNUNET_PSEUDONYM_get_info (cfg, &uri->data.sks.namespace,
- NULL, NULL, &name, NULL);
- unique_name = GNUNET_PSEUDONYM_name_uniquify (cfg, &uri->data.sks.namespace, name, NULL);
+ (void) GNUNET_FS_pseudonym_get_info (cfg, &uri->data.sks.ns,
+ NULL, NULL, &name, NULL);
+ unique_name = GNUNET_FS_pseudonym_name_uniquify (cfg, &uri->data.sks.ns, name, NULL);
GNUNET_free (name);
GNUNET_asprintf (&ret, "%s: %s", unique_name, uri->data.sks.identifier);
GNUNET_free (unique_name);
#if EXTRA_CHECKS
unsigned int i;
- if (uri->type == ksk)
+ if (uri->type == GNUNET_FS_URI_KSK)
{
for (i=0;i < uri->data.ksk.keywordCount; i++)
GNUNET_assert (uri->data.ksk.keywords[i] != NULL);
}
#endif
- return uri->type == ksk;
+ return uri->type == GNUNET_FS_URI_KSK;
}
int
GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == chk;
+ return uri->type == GNUNET_FS_URI_CHK;
}
{
switch (uri->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
return GNUNET_ntohll (uri->data.chk.file_length);
- case loc:
+ case GNUNET_FS_URI_LOC:
return GNUNET_ntohll (uri->data.loc.fi.file_length);
default:
GNUNET_assert (0);
int
GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == loc;
+ return uri->type == GNUNET_FS_URI_LOC;
}
return GNUNET_NO;
}
+
+/**
+ * FIXME: comment
+ */
static char *
normalize_metadata (enum EXTRACTOR_MetaFormat format, const char *data,
size_t data_len)
/**
* Where to break up keywords
*/
-#define TOKENS "_. /-!?#&+@\"\'\\;:,"
+#define TOKENS "_. /-!?#&+@\"\'\\;:,()[]{}$<>|"
/**
* Break the filename up by TOKENS to make
if (md == NULL)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ent = GNUNET_CONTAINER_meta_data_iterate (md, NULL, NULL);
if (ent > 0)
{
size_t slen;
const char *keyword;
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return NULL;
keywords = uri->data.ksk.keywords;
keywordCount = uri->data.ksk.keywordCount;
continue; /* skip leading space */
if (needs_percent (keyword[j]))
{
- sprintf (&ret[wpos], "%%%02X", keyword[j]);
+ sprintf (&ret[wpos], "%%%02X", (unsigned char) keyword[j]);
wpos += 3;
}
else
static char *
uri_sks_to_string (const struct GNUNET_FS_Uri *uri)
{
- const GNUNET_HashCode *namespace;
- const char *identifier;
char *ret;
- struct GNUNET_CRYPTO_HashAsciiEncoded ns;
+ char buf[1024];
- if (uri->type != sks)
+ if (GNUNET_FS_URI_SKS != uri->type)
return NULL;
- namespace = &uri->data.sks.namespace;
- identifier = uri->data.sks.identifier;
- GNUNET_CRYPTO_hash_to_enc (namespace, &ns);
+ ret = GNUNET_STRINGS_data_to_string (&uri->data.sks.ns,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+ buf,
+ sizeof (buf));
+ GNUNET_assert (NULL != ret);
+ ret[0] = '\0';
GNUNET_asprintf (&ret, "%s%s%s/%s", GNUNET_FS_URI_PREFIX,
- GNUNET_FS_URI_SKS_INFIX, (const char *) &ns, identifier);
+ GNUNET_FS_URI_SKS_INFIX, buf,
+ uri->data.sks.identifier);
return ret;
}
struct GNUNET_CRYPTO_HashAsciiEncoded keyhash;
struct GNUNET_CRYPTO_HashAsciiEncoded queryhash;
- if (uri->type != chk)
+ if (uri->type != GNUNET_FS_URI_CHK)
return NULL;
fi = &uri->data.chk;
GNUNET_CRYPTO_hash_to_enc (&fi->chk.key, &keyhash);
GNUNET_CRYPTO_hash_to_enc (&uri->data.loc.fi.chk.query, &queryhash);
peerId =
bin2enc (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey));
peerSig =
bin2enc (&uri->data.loc.contentSignature,
- sizeof (struct GNUNET_CRYPTO_RsaSignature));
- GNUNET_asprintf (&ret, "%s%s%s.%s.%llu.%s.%s.%llu", GNUNET_FS_URI_PREFIX,
+ sizeof (struct GNUNET_CRYPTO_EccSignature));
+ GNUNET_asprintf (&ret,
+ "%s%s%s.%s.%llu.%s.%s.%llu", GNUNET_FS_URI_PREFIX,
GNUNET_FS_URI_LOC_INFIX, (const char *) &keyhash,
(const char *) &queryhash,
(unsigned long long) GNUNET_ntohll (uri->data.loc.
fi.file_length), peerId,
peerSig,
- (unsigned long long) uri->data.loc.expirationTime.abs_value);
+ (unsigned long long) uri->data.loc.expirationTime.abs_value_us / 1000000LL);
GNUNET_free (peerSig);
GNUNET_free (peerId);
return ret;
}
switch (uri->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
return uri_ksk_to_string (uri);
- case sks:
+ case GNUNET_FS_URI_SKS:
return uri_sks_to_string (uri);
- case chk:
+ case GNUNET_FS_URI_CHK:
return uri_chk_to_string (uri);
- case loc:
+ case GNUNET_FS_URI_LOC:
return uri_loc_to_string (uri);
default:
GNUNET_break (0);
projects / oweals / gnunet.git / blobdiff