summaryrefslogtreecommitdiff
path: root/src/credential
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2017-04-21 13:51:04 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2017-04-21 13:51:04 +0200
commit324650a2a05cd38c896162dd8dd7aebd3ddfd25f (patch)
tree379add7ad6e4ff4c5ceb92237cde211dbbaac126 /src/credential
parentde63d950345774c45b8d36969d6ecf9fee43dd9b (diff)
-fix API changes
Diffstat (limited to 'src/credential')
-rw-r--r--src/credential/credential_api.c4
-rw-r--r--src/credential/gnunet-credential.c77
-rw-r--r--src/credential/gnunet-service-credential.c2
3 files changed, 48 insertions, 35 deletions
diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c
index f90bf9630..fd0c9e3d5 100644
--- a/src/credential/credential_api.c
+++ b/src/credential/credential_api.c
@@ -399,7 +399,7 @@ GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
"Trying to collect `%s' in CREDENTIAL\n",
issuer_attribute);
nlen = strlen (issuer_attribute) + 1;
- if (nlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (*vr))
+ if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr))
{
GNUNET_break (0);
return NULL;
@@ -475,7 +475,7 @@ GNUNET_CREDENTIAL_verify (struct GNUNET_CREDENTIAL_Handle *handle,
"Trying to verify `%s' in CREDENTIAL\n",
issuer_attribute);
nlen = strlen (issuer_attribute) + 1 + clen;
- if (nlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (*vr))
+ if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*vr))
{
GNUNET_break (0);
return NULL;
diff --git a/src/credential/gnunet-credential.c b/src/credential/gnunet-credential.c
index fb7bdb7f8..92804c97a 100644
--- a/src/credential/gnunet-credential.c
+++ b/src/credential/gnunet-credential.c
@@ -108,17 +108,17 @@ static char *issuer_attr;
/**
* Verify mode
*/
-static uint32_t verify;
+static int verify;
/**
* Issue mode
*/
-static uint32_t create_cred;
+static int create_cred;
/**
* Collect mode
*/
-static uint32_t collect;
+static int collect;
/**
* Task run on shutdown. Cleans up everything.
@@ -537,34 +537,49 @@ run (void *cls,
int
main (int argc, char *const *argv)
{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'I', "issue", NULL,
- gettext_noop ("create credential"), 0,
- &GNUNET_GETOPT_set_one, &create_cred},
- {'V', "verify", NULL,
- gettext_noop ("verify credential against attribute"), 0,
- &GNUNET_GETOPT_set_one, &verify},
- {'s', "subject", "PKEY",
- gettext_noop ("The public key of the subject to lookup the credential for"), 1,
- &GNUNET_GETOPT_set_string, &subject_key},
- {'b', "credential", "CRED",
- gettext_noop ("The name of the credential presented by the subject"), 1,
- &GNUNET_GETOPT_set_string, &subject_credential},
- {'i', "issuer", "PKEY",
- gettext_noop ("The public key of the authority to verify the credential against"), 1,
- &GNUNET_GETOPT_set_string, &issuer_key},
- {'e', "ego", "EGO",
- gettext_noop ("The ego to use"), 1,
- &GNUNET_GETOPT_set_string, &ego_name},
- {'a', "attribute", "ATTR",
- gettext_noop ("The issuer attribute to verify against or to issue"), 1,
- &GNUNET_GETOPT_set_string, &issuer_attr},
- {'T', "ttl", "EXP",
- gettext_noop ("The time to live for the credential"), 1,
- &GNUNET_GETOPT_set_string, &expiration},
- {'g', "collect", NULL,
- gettext_noop ("collect credentials"), 0,
- &GNUNET_GETOPT_set_one, &collect},
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_option_flag ('I',
+ "issue",
+ gettext_noop ("create credential"),
+ &create_cred),
+ GNUNET_GETOPT_option_flag ('V',
+ "verify",
+ gettext_noop ("verify credential against attribute"),
+ &verify),
+ GNUNET_GETOPT_option_string ('s',
+ "subject",
+ "PKEY",
+ gettext_noop ("The public key of the subject to lookup the credential for"),
+ &subject_key),
+ GNUNET_GETOPT_option_string ('b',
+ "credential",
+ "CRED",
+ gettext_noop ("The name of the credential presented by the subject"),
+ &subject_credential),
+ GNUNET_GETOPT_option_string ('i',
+ "issuer",
+ "PKEY",
+ gettext_noop ("The public key of the authority to verify the credential against"),
+ &issuer_key),
+ GNUNET_GETOPT_option_string ('e',
+ "ego",
+ "EGO",
+ gettext_noop ("The ego to use"),
+ &ego_name),
+ GNUNET_GETOPT_option_string ('a',
+ "attribute",
+ "ATTR",
+ gettext_noop ("The issuer attribute to verify against or to issue"),
+ &issuer_attr),
+ GNUNET_GETOPT_option_string ('T',
+ "ttl",
+ "EXP",
+ gettext_noop ("The time to live for the credential"),
+ &expiration),
+ GNUNET_GETOPT_option_flag ('g',
+ "collect",
+ gettext_noop ("collect credentials"),
+ &collect),
GNUNET_GETOPT_OPTION_END
};
int ret;
diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c
index 75ed6d5da..3178b133e 100644
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -772,7 +772,6 @@ backward_resolution (void* cls,
ds_entry->issuer_key, //issuer_key,
GNUNET_GNSRECORD_TYPE_ATTRIBUTE,
GNUNET_GNS_LO_DEFAULT,
- NULL, //shorten_key, always NULL
&backward_resolution,
ds_entry);
GNUNET_free (lookup_attribute);
@@ -855,7 +854,6 @@ delegation_chain_resolution_start (void* cls)
&vrh->issuer_key, //issuer_key,
GNUNET_GNSRECORD_TYPE_ATTRIBUTE,
GNUNET_GNS_LO_DEFAULT,
- NULL, //shorten_key, always NULL
&backward_resolution,
ds_entry);
}