[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36804 - in gnunet/src: identity-provider namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36804 - in gnunet/src: identity-provider namestore |
|
Date: |
Mon, 11 Jan 2016 20:48:15 +0100 |
Author: schanzen
Date: 2016-01-11 20:48:15 +0100 (Mon, 11 Jan 2016)
New Revision: 36804
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
gnunet/src/namestore/plugin_rest_namestore.c
Log:
-remove debug output
Modified: gnunet/src/identity-provider/gnunet-service-identity-provider.c
===================================================================
--- gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-01-11 16:36:26 UTC (rev 36803)
+++ gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-01-11 19:48:15 UTC (rev 36804)
@@ -1248,7 +1248,7 @@
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Looking for token under %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking for token under %s\n",
xchange_handle->ticket->payload->label);
GNUNET_asprintf (&lookup_query,
"%s.gnu",
@@ -1349,7 +1349,7 @@
char *tmp = GNUNET_GNSRECORD_value_to_string
(GNUNET_GNSRECORD_TYPE_ID_TOKEN_METADATA,
token_metadata_record->data,
token_metadata_record->data_size);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Token does not match audience %s vs %s. Moving on\n",
tmp2,
tmp);
@@ -1369,7 +1369,7 @@
if ((NULL != handle->attr_map) &&
(GNUNET_YES != GNUNET_CONTAINER_multihashmap_contains
(handle->attr_map, &key)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Issued token does not include `%s'. Moving on\n", scope);
GNUNET_free (tmp_scopes);
GNUNET_NAMESTORE_zone_iterator_next (handle->ns_it);
Modified: gnunet/src/identity-provider/identity_token.c
===================================================================
--- gnunet/src/identity-provider/identity_token.c 2016-01-11 16:36:26 UTC
(rev 36803)
+++ gnunet/src/identity-provider/identity_token.c 2016-01-11 19:48:15 UTC
(rev 36804)
@@ -50,7 +50,7 @@
GNUNET_CRYPTO_hash_to_enc (new_key_hash,
&new_key_hash_str);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Creating symmetric rsa key from %s\n",
(char*)&new_key_hash_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating symmetric rsa key from %s\n",
(char*)&new_key_hash_str);
static const char ctx_key[] = "gnuid-aes-ctx-key";
GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
new_key_hash, sizeof (struct GNUNET_HashCode),
@@ -97,7 +97,7 @@
&enc_key,
&enc_iv,
str_buf);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Decrypted bytes: %d Expected bytes:
%d\n", str_size, cyphertext_len);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Decrypted bytes: %d Expected bytes:
%d\n", str_size, cyphertext_len);
if (-1 == str_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ECDH invalid\n");
@@ -171,7 +171,7 @@
pub_key,
&new_key_hash));
create_sym_key_from_ecdh(&new_key_hash, &skey, &iv);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Encrypting string %s\n (len=%d)",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypting string %s\n (len=%d)",
plaintext,
strlen (plaintext));
enc_size = GNUNET_CRYPTO_symmetric_encrypt (plaintext,
@@ -178,7 +178,7 @@
strlen (plaintext),
&skey, &iv,
*cyphertext);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Encrypted (len=%d)", enc_size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted (len=%d)", enc_size);
return GNUNET_OK;
}
@@ -724,7 +724,7 @@
dh_key_str = GNUNET_STRINGS_data_to_string_alloc (&ticket->ecdh_pubkey,
sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Using ECDH pubkey %s to encrypt\n",
dh_key_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using ECDH pubkey %s to encrypt\n",
dh_key_str);
GNUNET_asprintf (&ticket_str, "{\"meta\": \"%s\", \"ecdh\": \"%s\",
\"signature\": \"%s\"}",
ticket_payload_str, dh_key_str, ticket_sig_str);
GNUNET_STRINGS_base64_encode (ticket_str, strlen (ticket_str), result);
@@ -767,7 +767,7 @@
return GNUNET_SYSERR;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Metadata: %s\n", meta_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Metadata: %s\n", meta_str);
root = json_loads (meta_str, JSON_DECODE_ANY, &err_json);
if (!root)
{
@@ -804,7 +804,7 @@
}
label_str = json_string_value (label_json);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found label: %s\n", label_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found label: %s\n", label_str);
nonce_json = json_object_get (root, "nonce");
if (!json_is_string (label_json))
@@ -817,7 +817,7 @@
}
nonce_str = json_string_value (nonce_json);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found nonce: %s\n", nonce_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found nonce: %s\n", nonce_str);
*result = ticket_payload_create (nonce_str,
(const struct
GNUNET_CRYPTO_EcdsaPublicKey*)&id_pkey,
@@ -852,7 +852,7 @@
ticket_decoded = NULL;
GNUNET_STRINGS_base64_decode (raw_data, strlen (raw_data), &ticket_decoded);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Token Code: %s\n", ticket_decoded);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ticket: %s\n", ticket_decoded);
root = json_loads (ticket_decoded, JSON_DECODE_ANY, &err_json);
if (!root)
{
@@ -881,7 +881,7 @@
GNUNET_free (ticket);
return GNUNET_SYSERR;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Using ECDH pubkey %s for metadata
decryption\n", ecdh_enc_str);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using ECDH pubkey %s for metadata
decryption\n", ecdh_enc_str);
if (GNUNET_OK != GNUNET_STRINGS_string_to_data (signature_enc_str,
strlen (signature_enc_str),
&ticket->signature,
@@ -938,7 +938,7 @@
json_decref (root);
GNUNET_free (purpose);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error verifying signature for token code\n");
+ "Error verifying signature for ticket\n");
return GNUNET_SYSERR;
}
*result = ticket;
Modified: gnunet/src/identity-provider/plugin_rest_identity_provider.c
===================================================================
--- gnunet/src/identity-provider/plugin_rest_identity_provider.c
2016-01-11 16:36:26 UTC (rev 36803)
+++ gnunet/src/identity-provider/plugin_rest_identity_provider.c
2016-01-11 19:48:15 UTC (rev 36804)
@@ -66,7 +66,6 @@
*/
#define GNUNET_REST_JSONAPI_IDENTITY_PROVIDER_TOKEN "token"
-
/**
* The URL parameter name in which the nonce must be provided
*/
@@ -783,7 +782,6 @@
GNUNET_free (token_str);
result = json_dumps (root, JSON_INDENT(1));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", result);
resp = GNUNET_REST_create_json_response (result);
GNUNET_free (result);
handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
Modified: gnunet/src/namestore/plugin_rest_namestore.c
===================================================================
--- gnunet/src/namestore/plugin_rest_namestore.c 2016-01-11 16:36:26 UTC
(rev 36803)
+++ gnunet/src/namestore/plugin_rest_namestore.c 2016-01-11 19:48:15 UTC
(rev 36804)
@@ -499,9 +499,6 @@
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received %u records for name `%s'\n",
- rd_count, rec_name);
if (0 != rd_count)
{
handle->proc (handle->proc_cls,
@@ -1087,10 +1084,8 @@
GNUNET_asprintf (&handle->ego_name, "%s", ego);
if (NULL != name)
GNUNET_asprintf (&handle->name, "%s", name);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", handle->ego_name);
if (NULL == handle->ego_name)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", handle->ego_name);
handle->identity_handle = GNUNET_IDENTITY_connect (handle->cfg,
&id_connect_cb, handle);
if (NULL == handle->identity_handle)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36804 - in gnunet/src: identity-provider namestore,
gnunet <=