diff options
m--------- | contrib/build-common | 0 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 2 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 17 | ||||
-rw-r--r-- | src/curl/curl.c | 4 | ||||
-rw-r--r-- | src/gnsrecord/gnsrecord_crypto.c | 2 | ||||
-rw-r--r-- | src/include/gnunet_util_lib.h | 1 |
6 files changed, 11 insertions, 15 deletions
diff --git a/contrib/build-common b/contrib/build-common | |||
Subproject d81bbfabc2538932f631d3946bd6a9b95182b4f | Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f | ||
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index a2c710cbc..5c8103c5e 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -2026,4 +2026,4 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level) | |||
2026 | } | 2026 | } |
2027 | 2027 | ||
2028 | 2028 | ||
2029 | /* end of gnunet-service-cadet-new_channel.c */ | 2029 | /* end of gnunet-service-cadet_channel.c */ |
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index a1098d757..ae201ed2d 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -544,29 +544,22 @@ estate2s (enum CadetTunnelEState es) | |||
544 | { | 544 | { |
545 | case CADET_TUNNEL_KEY_UNINITIALIZED: | 545 | case CADET_TUNNEL_KEY_UNINITIALIZED: |
546 | return "CADET_TUNNEL_KEY_UNINITIALIZED"; | 546 | return "CADET_TUNNEL_KEY_UNINITIALIZED"; |
547 | |||
548 | case CADET_TUNNEL_KEY_AX_RECV: | 547 | case CADET_TUNNEL_KEY_AX_RECV: |
549 | return "CADET_TUNNEL_KEY_AX_RECV"; | 548 | return "CADET_TUNNEL_KEY_AX_RECV"; |
550 | |||
551 | case CADET_TUNNEL_KEY_AX_SENT: | 549 | case CADET_TUNNEL_KEY_AX_SENT: |
552 | return "CADET_TUNNEL_KEY_AX_SENT"; | 550 | return "CADET_TUNNEL_KEY_AX_SENT"; |
553 | |||
554 | case CADET_TUNNEL_KEY_AX_SENT_AND_RECV: | 551 | case CADET_TUNNEL_KEY_AX_SENT_AND_RECV: |
555 | return "CADET_TUNNEL_KEY_AX_SENT_AND_RECV"; | 552 | return "CADET_TUNNEL_KEY_AX_SENT_AND_RECV"; |
556 | |||
557 | case CADET_TUNNEL_KEY_AX_AUTH_SENT: | 553 | case CADET_TUNNEL_KEY_AX_AUTH_SENT: |
558 | return "CADET_TUNNEL_KEY_AX_AUTH_SENT"; | 554 | return "CADET_TUNNEL_KEY_AX_AUTH_SENT"; |
559 | |||
560 | case CADET_TUNNEL_KEY_OK: | 555 | case CADET_TUNNEL_KEY_OK: |
561 | return "CADET_TUNNEL_KEY_OK"; | 556 | return "CADET_TUNNEL_KEY_OK"; |
562 | |||
563 | default: | ||
564 | GNUNET_snprintf (buf, | ||
565 | sizeof(buf), | ||
566 | "%u (UNKNOWN STATE)", | ||
567 | es); | ||
568 | return buf; | ||
569 | } | 557 | } |
558 | GNUNET_snprintf (buf, | ||
559 | sizeof(buf), | ||
560 | "%u (UNKNOWN STATE)", | ||
561 | es); | ||
562 | return buf; | ||
570 | } | 563 | } |
571 | 564 | ||
572 | 565 | ||
diff --git a/src/curl/curl.c b/src/curl/curl.c index 82eb28ed9..01c7c5fca 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c | |||
@@ -556,7 +556,9 @@ GNUNET_CURL_download_get_result_ (struct GNUNET_CURL_DownloadBuffer *db, | |||
556 | } | 556 | } |
557 | if (0 != db->buf_size) | 557 | if (0 != db->buf_size) |
558 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 558 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
559 | "Did NOT detect response as JSON\n"); | 559 | "Did NOT detect response `%.*s' as JSON\n", |
560 | (int) db->buf_size, | ||
561 | (const char *) db->buf); | ||
560 | return NULL; | 562 | return NULL; |
561 | } | 563 | } |
562 | json = NULL; | 564 | json = NULL; |
diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index b27688019..ea8baa77d 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c | |||
@@ -80,7 +80,7 @@ derive_block_aes_key (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | |||
80 | * @param rd_count number of records | 80 | * @param rd_count number of records |
81 | * @return NULL on error (block too large) | 81 | * @return NULL on error (block too large) |
82 | */ | 82 | */ |
83 | struct GNUNET_GNSRECORD_Block * | 83 | static struct GNUNET_GNSRECORD_Block * |
84 | block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | 84 | block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, |
85 | const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey, | 85 | const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey, |
86 | struct GNUNET_TIME_Absolute expire, | 86 | struct GNUNET_TIME_Absolute expire, |
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index 24ad4e4e5..5e790550f 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h | |||
@@ -64,6 +64,7 @@ extern "C" | |||
64 | #include "gnunet_crypto_lib.h" | 64 | #include "gnunet_crypto_lib.h" |
65 | #include "gnunet_bandwidth_lib.h" | 65 | #include "gnunet_bandwidth_lib.h" |
66 | #include "gnunet_bio_lib.h" | 66 | #include "gnunet_bio_lib.h" |
67 | #include "gnunet_buffer_lib.h" | ||
67 | #include "gnunet_client_lib.h" | 68 | #include "gnunet_client_lib.h" |
68 | #include "gnunet_container_lib.h" | 69 | #include "gnunet_container_lib.h" |
69 | #include "gnunet_getopt_lib.h" | 70 | #include "gnunet_getopt_lib.h" |