[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36867 - gnunet/src/identity-provider
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36867 - gnunet/src/identity-provider |
Date: |
Sun, 24 Jan 2016 13:39:50 +0100 |
Author: schanzen
Date: 2016-01-24 13:39:50 +0100 (Sun, 24 Jan 2016)
New Revision: 36867
Modified:
gnunet/src/identity-provider/gnunet-service-identity-provider.c
gnunet/src/identity-provider/identity_token.c
gnunet/src/identity-provider/plugin_rest_identity_provider.c
Log:
- sscanf type fix
Modified: gnunet/src/identity-provider/gnunet-service-identity-provider.c
===================================================================
--- gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-01-24 10:44:10 UTC (rev 36866)
+++ gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-01-24 12:39:50 UTC (rev 36867)
@@ -35,6 +35,7 @@
#include "gnunet_signatures.h"
#include "identity_provider.h"
#include "identity_token.h"
+#include <inttypes.h>
/**
* First pass state
@@ -368,11 +369,11 @@
if (0 == strcmp (attr->name, "exp"))
{
sscanf (attr->val_head->value,
- "%lu",
+ "%"SCNu64,
&token_exp.abs_value_us);
} else if (0 == strcmp (attr->name, "nbf")) {
sscanf (attr->val_head->value,
- "%lu",
+ "%"SCNu64,
&token_nbf.abs_value_us);
}
}
Modified: gnunet/src/identity-provider/identity_token.c
===================================================================
--- gnunet/src/identity-provider/identity_token.c 2016-01-24 10:44:10 UTC
(rev 36866)
+++ gnunet/src/identity-provider/identity_token.c 2016-01-24 12:39:50 UTC
(rev 36867)
@@ -28,6 +28,7 @@
#include "gnunet_signatures.h"
#include "identity_token.h"
#include <jansson.h>
+#include <inttypes.h>
#define JWT_ALG "alg"
@@ -628,7 +629,7 @@
sizeof (struct
GNUNET_CRYPTO_EcdsaPublicKey));
GNUNET_asprintf (result,
- "{\"nonce\": \"%lu\",\"identity\": \"%s\",\"label\":
\"%s\"}",
+ "{\"nonce\": \""SCNu64"\",\"identity\": \"%s\",\"label\":
\"%s\"}",
payload->nonce, identity_key_str, payload->label);
GNUNET_free (identity_key_str);
@@ -818,7 +819,7 @@
nonce_str = json_string_value (nonce_json);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found nonce: %s\n", nonce_str);
- GNUNET_assert (0 != sscanf (nonce_str, "%lu", &nonce));
+ GNUNET_assert (0 != sscanf (nonce_str, "%"SCNu64, &nonce));
*result = ticket_payload_create (nonce,
(const struct
GNUNET_CRYPTO_EcdsaPublicKey*)&id_pkey,
Modified: gnunet/src/identity-provider/plugin_rest_identity_provider.c
===================================================================
--- gnunet/src/identity-provider/plugin_rest_identity_provider.c
2016-01-24 10:44:10 UTC (rev 36866)
+++ gnunet/src/identity-provider/plugin_rest_identity_provider.c
2016-01-24 12:39:50 UTC (rev 36867)
@@ -33,6 +33,7 @@
#include "gnunet_rest_lib.h"
#include "microhttpd.h"
#include <jansson.h>
+#include <inttypes.h>
#include "gnunet_signatures.h"
#include "gnunet_identity_provider_service.h"
@@ -551,7 +552,7 @@
nonce_str = GNUNET_CONTAINER_multihashmap_get
(handle->conndata_handle->url_param_map,
&key);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Request nonce: %s\n", nonce_str);
- sscanf (nonce_str, "%lu", &nonce);
+ sscanf (nonce_str, "%"SCNu64, &nonce);
//Get expiration for token from URL parameter
GNUNET_CRYPTO_hash (GNUNET_IDENTITY_TOKEN_EXP_STRING,
@@ -799,7 +800,7 @@
}
nonce_str = GNUNET_CONTAINER_multihashmap_get
(handle->conndata_handle->url_param_map,
&key);
- GNUNET_assert (1 == sscanf (nonce_str, "%lu", &expected_nonce));
+ GNUNET_assert (1 == sscanf (nonce_str, "%"SCNu64, &expected_nonce));
if (ticket_nonce != expected_nonce)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36867 - gnunet/src/identity-provider,
gnunet <=