* @param key where to store the unique key
*/
void
-GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
+GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
struct GNUNET_HashCode *key)
{
switch (uri->type)
case GNUNET_FS_URI_LOC:
GNUNET_CRYPTO_hash (&uri->data.loc.fi,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
key);
break;
default:
uri_sks_parse (const char *s, char **emsg)
{
struct GNUNET_FS_Uri *ret;
- struct GNUNET_CRYPTO_EccPublicSignKey ns;
+ struct GNUNET_CRYPTO_EcdsaPublicKey ns;
size_t pos;
char *end;
end = strchr (&s[pos], '/');
if ( (NULL == end) ||
(GNUNET_OK !=
- GNUNET_STRINGS_string_to_data (&s[pos],
+ GNUNET_STRINGS_string_to_data (&s[pos],
end - &s[pos],
&ns,
sizeof (ns))) )
/**
* File being offered.
- */
+ */
struct FileIdentifier fi;
/**
* Peer offering the file.
- */
- struct GNUNET_CRYPTO_EccPublicSignKey peer;
+ */
+ struct GNUNET_PeerIdentity peer;
};
GNUNET_NETWORK_STRUCT_END
unsigned long long exptime;
unsigned long long flen;
struct GNUNET_TIME_Absolute et;
- struct GNUNET_CRYPTO_EccSignature sig;
+ struct GNUNET_CRYPTO_EddsaSignature sig;
struct LocUriAssembly ass;
int ret;
size_t slen;
npos++;
ret =
enc2bin (&s[npos], &ass.peer,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
if (ret == -1)
{
*emsg =
*emsg = GNUNET_strdup (_("SKS URI malformed (could not find signature)"));
goto ERR;
}
- ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_EccSignature));
+ ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_EcdsaSignature));
if (ret == -1)
{
*emsg = GNUNET_strdup (_("SKS URI malformed (could not decode signature)"));
et.abs_value_us = exptime * 1000LL * 1000LL;
ass.exptime = GNUNET_TIME_absolute_hton (et);
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
- &ass.purpose, &sig, &ass.peer))
+ GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
+ &ass.purpose, &sig, &ass.peer.public_key))
{
*emsg =
GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
*
* @param uri the location URI to inspect
* @param peer where to store the identify of the peer (presumably) offering the content
- * @return GNUNET_SYSERR if this is not a location URI, otherwise GNUNET_OK
+ * @return #GNUNET_SYSERR if this is not a location URI, otherwise #GNUNET_OK
*/
int
GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
{
if (uri->type != GNUNET_FS_URI_LOC)
return GNUNET_SYSERR;
- GNUNET_CRYPTO_hash (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
- &peer->hashPubKey);
+ *peer = uri->data.loc.peer;
return GNUNET_OK;
}
struct GNUNET_TIME_Absolute expiration_time)
{
struct GNUNET_FS_Uri *uri;
- struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
- struct GNUNET_CRYPTO_EccPublicSignKey my_public_key;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey my_public_key;
char *keyfile;
struct LocUriAssembly ass;
struct GNUNET_TIME_Absolute et;
_("Lacking key configuration settings.\n"));
return NULL;
}
- if (NULL == (my_private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile)))
+ if (NULL == (my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access hostkey file `%s'.\n"), keyfile);
GNUNET_free (keyfile);
/* 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_for_signature (my_private_key, &my_public_key);
+ GNUNET_CRYPTO_eddsa_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 (et);
ass.fi = baseUri->data.chk;
- ass.peer = my_public_key;
+ ass.peer.public_key = my_public_key;
uri = GNUNET_new (struct GNUNET_FS_Uri);
uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = baseUri->data.chk;
uri->data.loc.expirationTime = et;
- uri->data.loc.peer = my_public_key;
+ uri->data.loc.peer.public_key = my_public_key;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_ecc_sign (my_private_key, &ass.purpose,
- &uri->data.loc.contentSignature));
+ GNUNET_CRYPTO_eddsa_sign (my_private_key, &ass.purpose,
+ &uri->data.loc.contentSignature));
GNUNET_free (my_private_key);
return uri;
}
* @return an FS URI for the given namespace and identifier
*/
struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns,
+GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EcdsaPublicKey *ns,
const char *id)
{
struct GNUNET_FS_Uri *ns_uri;
case GNUNET_FS_URI_SKS:
if ((0 ==
memcmp (&u1->data.sks.ns, &u2->data.sks.ns,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))) &&
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))) &&
(0 == strcmp (u1->data.sks.identifier, u2->data.sks.identifier)))
return GNUNET_YES;
if (memcmp
(&u1->data.loc, &u2->data.loc,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) +
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
sizeof (struct GNUNET_TIME_Absolute) + sizeof (unsigned short) +
sizeof (unsigned short)) != 0)
return GNUNET_NO;
*/
int
GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
- struct GNUNET_CRYPTO_EccPublicSignKey *pseudonym)
+ struct GNUNET_CRYPTO_EcdsaPublicKey *pseudonym)
{
if (!GNUNET_FS_uri_test_sks (uri))
{
* Add a keyword as non-mandatory (with ' '-prefix) to the
* given keyword list at offset 'index'. The array is
* guaranteed to be long enough.
- *
+ *
* @param s keyword to add
* @param array array to add the keyword to
* @param index offset where to add the keyword
insert_non_mandatory_keyword (const char *s, char **array, int index)
{
char *nkword;
- GNUNET_asprintf (&nkword, " %s", /* space to mark as 'non mandatory' */ s);
+
+ GNUNET_asprintf (&nkword,
+ " %s", /* space to mark as 'non mandatory' */
+ s);
array[index] = nkword;
}
/**
- * Test if the given keyword 's' is already present in the
+ * Test if the given keyword @a s is already present in the
* given array, ignoring the '+'-mandatory prefix in the array.
*
* @param s keyword to test
* @param array keywords to test against, with ' ' or '+' prefix to ignore
- * @param array_length length of the array
- * @return GNUNET_YES if the keyword exists, GNUNET_NO if not
- */
+ * @param array_length length of the @a array
+ * @return #GNUNET_YES if the keyword exists, #GNUNET_NO if not
+ */
static int
find_duplicate (const char *s, const char **array, int array_length)
{
* FIXME: comment
*/
static char *
-normalize_metadata (enum EXTRACTOR_MetaFormat format, const char *data,
- size_t data_len)
+normalize_metadata (enum EXTRACTOR_MetaFormat format,
+ const char *data,
+ size_t data_len)
{
uint8_t *free_str = NULL;
uint8_t *str_to_normalize = (uint8_t *) data;
* to it are used to check for duplicates). ignored if array == NULL.
* @return number of tokens counted (including duplicates), or number of
* tokens extracted (excluding duplicates). 0 if there are no
- * matching parens in the string (when counting), or when all tokens
+ * matching parens in the string (when counting), or when all tokens
* were duplicates (when extracting).
*/
static int
else
count++;
close_paren[0] = tmp;
- }
+ }
}
GNUNET_free (ss);
return count;
}
#undef TOKENS
+
/**
* Function called on each value in the meta data.
* Adds it to the URI.
* @param data_mime_type mime-type of data (not of the original file);
* can be NULL (if mime-type is not known)
* @param data actual meta-data found
- * @param data_len number of bytes in data
+ * @param data_len number of bytes in @a data
* @return 0 (always)
*/
static int
gather_uri_data (void *cls, const char *plugin_name,
- enum EXTRACTOR_MetaType type, enum EXTRACTOR_MetaFormat format,
- const char *data_mime_type, const char *data, size_t data_len)
+ enum EXTRACTOR_MetaType type,
+ enum EXTRACTOR_MetaFormat format,
+ const char *data_mime_type,
+ const char *data,
+ size_t data_len)
{
struct GNUNET_FS_Uri *uri = cls;
char *normalized_data;
+ const char *sep;
if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
(format != EXTRACTOR_METAFORMAT_C_STRING))
* If it does - fix the extractor, not this check!
*/
if (u8_strcount ((const uint8_t *) data) <= 2)
- {
return 0;
+ if ( (EXTRACTOR_METATYPE_MIMETYPE == type) &&
+ (NULL != (sep = memchr (data, '/', data_len))) &&
+ (sep != data) )
+ {
+ char *xtra;
+
+ GNUNET_asprintf (&xtra,
+ "mimetype:%.*s",
+ (int) (sep - data),
+ data);
+ if (! find_duplicate (xtra,
+ (const char **) uri->data.ksk.keywords,
+ uri->data.ksk.keywordCount))
+ {
+ insert_non_mandatory_keyword (xtra,
+ uri->data.ksk.keywords,
+ uri->data.ksk.keywordCount);
+ uri->data.ksk.keywordCount++;
+ }
+ GNUNET_free (xtra);
}
+
normalized_data = normalize_metadata (format, data, data_len);
- if (!find_duplicate (data, (const char **) uri->data.ksk.keywords, uri->data.ksk.keywordCount))
+ if (! find_duplicate (data,
+ (const char **) uri->data.ksk.keywords,
+ uri->data.ksk.keywordCount))
{
insert_non_mandatory_keyword (data,
uri->data.ksk.keywords, uri->data.ksk.keywordCount);
uri->data.ksk.keywordCount++;
}
- if (normalized_data != NULL)
- {
- if (!find_duplicate (normalized_data, (const char **) uri->data.ksk.keywords, uri->data.ksk.keywordCount))
+ if (NULL != normalized_data)
+ {
+ if (! find_duplicate (normalized_data,
+ (const char **) uri->data.ksk.keywords,
+ uri->data.ksk.keywordCount))
{
insert_non_mandatory_keyword (normalized_data,
uri->data.ksk.keywords, uri->data.ksk.keywordCount);
* @return NULL on error, otherwise a KSK URI
*/
struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData
- *md)
+GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData *md)
{
struct GNUNET_FS_Uri *ret;
char *filename;
int tok_keywords = 0;
int paren_keywords = 0;
- if (md == NULL)
+ if (NULL == md)
return NULL;
ret = GNUNET_new (struct GNUNET_FS_Uri);
ret->type = GNUNET_FS_URI_KSK;
tok_keywords = get_keywords_from_tokens (filename, NULL, 0);
paren_keywords = get_keywords_from_parens (filename, NULL, 0);
}
- /* x2 because there might be a normalized variant of every keyword */
- ret->data.ksk.keywords = GNUNET_malloc (sizeof (char *) * (ent
- + tok_keywords + paren_keywords) * 2);
+ /* x3 because there might be a normalized variant of every keyword,
+ plus theoretically one more for mime... */
+ ret->data.ksk.keywords = GNUNET_malloc
+ (sizeof (char *) * (ent + tok_keywords + paren_keywords) * 3);
GNUNET_CONTAINER_meta_data_iterate (md, &gather_uri_data, ret);
}
if (tok_keywords > 0)
ret->data.ksk.keywordCount += get_keywords_from_tokens (filename,
- ret->data.ksk.keywords,
- ret->data.ksk.keywordCount);
+ ret->data.ksk.keywords,
+ ret->data.ksk.keywordCount);
if (paren_keywords > 0)
ret->data.ksk.keywordCount += get_keywords_from_parens (filename,
- ret->data.ksk.keywords,
- ret->data.ksk.keywordCount);
+ ret->data.ksk.keywords,
+ ret->data.ksk.keywordCount);
if (ent > 0)
GNUNET_free_non_null (full_name);
return ret;
if (GNUNET_FS_URI_SKS != uri->type)
return NULL;
ret = GNUNET_STRINGS_data_to_string (&uri->data.sks.ns,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
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, buf,
+ GNUNET_FS_URI_SKS_INFIX, buf,
uri->data.sks.identifier);
return ret;
}
GNUNET_CRYPTO_hash_to_enc (&uri->data.loc.fi.chk.query, &queryhash);
peerId =
bin2enc (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
peerSig =
bin2enc (&uri->data.loc.contentSignature,
- sizeof (struct GNUNET_CRYPTO_EccSignature));
- GNUNET_asprintf (&ret,
+ sizeof (struct GNUNET_CRYPTO_EcdsaSignature));
+ 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,
projects / oweals / gnunet.git / blobdiff