-merge

diff --combined configure.ac
index 9ab0a231638227b4986c88c7a802587b65940151,eae03b01b6ad3f006f1e29aa50e5459f63e0fa41..ac00bd5d67d478a36147d12694b0826f1a4f04b4
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  # This file is part of GNUnet.
- # (C) 2001--2017 GNUnet e.V.
+ # (C) 2001--2018 GNUnet e.V.
  #
  # GNUnet is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published
@@@ -22,7 -22,7 +22,7 @@@
  #
  AC_PREREQ(2.61)
  # Checks for programs.
- AC_INIT([gnunet], [0.10.1], [bug-gnunet@gnu.org])
+ AC_INIT([gnunet], [0.11.0], [bug-gnunet@gnu.org])
  
  AC_CANONICAL_TARGET
  AC_CANONICAL_HOST
@@@ -446,27 -446,6 +446,27 @@@ AC_CHECK_LIB(ogg, ogg_stream_flush_fill
          ogg=0)
  
  
 +PKG_CHECK_MODULES([GLIB], [glib-2.0])
 +# check for pbc library
 +pbc=0
 +AC_CHECK_HEADER([pbc/pbc.h],pbc=1)
 +AC_CHECK_HEADER([gabe.h],abe=1)
 +AM_CONDITIONAL(HAVE_PBC, [test "$pbc" = 1])
 +AM_CONDITIONAL(HAVE_ABE, [test "$abe" = 1])
 +if test "x$pbc" = x1
 +then
 +  AC_DEFINE([HAVE_PBC],[1],[Have pbc library])
 +else
 +  AC_DEFINE([HAVE_PBC],[0],[Lacking pbc library])
 +fi
 +if test "x$abe" = x1
 +then
 +  AC_DEFINE([HAVE_ABE],[1],[Have ABE library])
 +else
 +  AC_DEFINE([HAVE_ABE],[0],[Lacking ABE library])
 +fi
 +
 +
  
  gst=0
  PKG_CHECK_MODULES(
@@@ -1580,8 -1559,6 +1580,6 @@@ src/dht/Makefil
  src/dht/dht.conf
  src/dns/Makefile
  src/dns/dns.conf
- src/dv/Makefile
- src/dv/dv.conf
  src/exit/Makefile
  src/fragmentation/Makefile
  src/fs/Makefile
@@@ -1593,8 -1570,6 +1591,8 @@@ src/gnsrecord/Makefil
  src/hello/Makefile
  src/identity/Makefile
  src/identity/identity.conf
 +src/credential/Makefile
 +src/credential/credential.conf
  src/include/Makefile
  src/integration-tests/Makefile
  src/json/Makefile
@@@ -1660,7 -1635,6 +1658,7 @@@ src/vpn/vpn.con
  src/zonemaster/Makefile
  src/zonemaster/zonemaster.conf
  src/rest/Makefile
 +src/identity-attribute/Makefile
  src/identity-provider/Makefile
  pkgconfig/Makefile
  pkgconfig/gnunetarm.pc

diff --combined po/POTFILES.in
index 01c197fcd41b7eb4326e6fe38ca11b9c25c86eeb,4a4cfbd96998d4e174a11646dc5453c55c96539f..e0654d4b47f4e01f9364d062b3a48caea8deab4a
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -3,21 -3,13 +3,21 @@@ src/arm/arm_monitor_api.
  src/arm/gnunet-arm.c
  src/arm/gnunet-service-arm.c
  src/arm/mockup-service.c
 +src/ats-tests/ats-testing-experiment.c
 +src/ats-tests/ats-testing-log.c
 +src/ats-tests/ats-testing-preferences.c
 +src/ats-tests/ats-testing-traffic.c
 +src/ats-tests/ats-testing.c
 +src/ats-tests/gnunet-ats-sim.c
 +src/ats-tests/gnunet-solver-eval.c
 +src/ats-tool/gnunet-ats.c
  src/ats/ats_api_connectivity.c
  src/ats/ats_api_performance.c
  src/ats/ats_api_scanner.c
  src/ats/ats_api_scheduling.c
  src/ats/gnunet-ats-solver-eval.c
 -src/ats/gnunet-service-ats_addresses.c
  src/ats/gnunet-service-ats.c
 +src/ats/gnunet-service-ats_addresses.c
  src/ats/gnunet-service-ats_connectivity.c
  src/ats/gnunet-service-ats_normalization.c
  src/ats/gnunet-service-ats_performance.c
@@@ -28,6 -20,14 +28,6 @@@ src/ats/gnunet-service-ats_scheduling.
  src/ats/plugin_ats_mlp.c
  src/ats/plugin_ats_proportional.c
  src/ats/plugin_ats_ril.c
 -src/ats-tests/ats-testing.c
 -src/ats-tests/ats-testing-experiment.c
 -src/ats-tests/ats-testing-log.c
 -src/ats-tests/ats-testing-preferences.c
 -src/ats-tests/ats-testing-traffic.c
 -src/ats-tests/gnunet-ats-sim.c
 -src/ats-tests/gnunet-solver-eval.c
 -src/ats-tool/gnunet-ats.c
  src/auction/gnunet-auction-create.c
  src/auction/gnunet-auction-info.c
  src/auction/gnunet-auction-join.c
@@@ -39,8 -39,8 +39,8 @@@ src/block/plugin_block_test.
  src/cadet/cadet_api.c
  src/cadet/cadet_test_lib.c
  src/cadet/desirability_table.c
 -src/cadet/gnunet-cadet.c
  src/cadet/gnunet-cadet-profiler.c
 +src/cadet/gnunet-cadet.c
  src/cadet/gnunet-service-cadet.c
  src/cadet/gnunet-service-cadet_channel.c
  src/cadet/gnunet-service-cadet_connection.c
@@@ -56,15 -56,15 +56,15 @@@ src/consensus/gnunet-service-consensus.
  src/consensus/plugin_block_consensus.c
  src/conversation/conversation_api.c
  src/conversation/conversation_api_call.c
 -src/conversation/gnunet-conversation.c
  src/conversation/gnunet-conversation-test.c
 -src/conversation/gnunet_gst.c
 -src/conversation/gnunet_gst_test.c
 -src/conversation/gnunet-helper-audio-playback.c
 +src/conversation/gnunet-conversation.c
  src/conversation/gnunet-helper-audio-playback-gst.c
 -src/conversation/gnunet-helper-audio-record.c
 +src/conversation/gnunet-helper-audio-playback.c
  src/conversation/gnunet-helper-audio-record-gst.c
 +src/conversation/gnunet-helper-audio-record.c
  src/conversation/gnunet-service-conversation.c
 +src/conversation/gnunet_gst.c
 +src/conversation/gnunet_gst_test.c
  src/conversation/microphone.c
  src/conversation/plugin_gnsrecord_conversation.c
  src/conversation/speaker.c
@@@ -75,13 -75,6 +75,13 @@@ src/core/gnunet-service-core.
  src/core/gnunet-service-core_kx.c
  src/core/gnunet-service-core_sessions.c
  src/core/gnunet-service-core_typemap.c
 +src/credential/credential_api.c
 +src/credential/credential_misc.c
 +src/credential/credential_serialization.c
 +src/credential/gnunet-credential.c
 +src/credential/gnunet-service-credential.c
 +src/credential/plugin_gnsrecord_credential.c
 +src/credential/plugin_rest_credential.c
  src/curl/curl.c
  src/curl/curl_reschedule.c
  src/datacache/datacache.c
@@@ -101,6 -94,7 +101,6 @@@ src/dht/dht_api.
  src/dht/dht_test_lib.c
  src/dht/gnunet-dht-get.c
  src/dht/gnunet-dht-monitor.c
 -src/dht/gnunet_dht_profiler.c
  src/dht/gnunet-dht-put.c
  src/dht/gnunet-service-dht.c
  src/dht/gnunet-service-dht_clients.c
@@@ -109,7 -103,6 +109,7 @@@ src/dht/gnunet-service-dht_hello.
  src/dht/gnunet-service-dht_neighbours.c
  src/dht/gnunet-service-dht_nse.c
  src/dht/gnunet-service-dht_routing.c
 +src/dht/gnunet_dht_profiler.c
  src/dht/plugin_block_dht.c
  src/dns/dns_api.c
  src/dns/dnsparser.c
@@@ -124,8 -117,8 +124,8 @@@ src/dv/gnunet-dv.
  src/dv/gnunet-service-dv.c
  src/dv/plugin_transport_dv.c
  src/exit/gnunet-daemon-exit.c
 -src/exit/gnunet-helper-exit.c
  src/exit/gnunet-helper-exit-windows.c
 +src/exit/gnunet-helper-exit.c
  src/fragmentation/defragmentation.c
  src/fragmentation/fragmentation.c
  src/fs/fs_api.c
@@@ -150,8 -143,8 +150,8 @@@ src/fs/gnunet-auto-share.
  src/fs/gnunet-daemon-fsprofiler.c
  src/fs/gnunet-directory.c
  src/fs/gnunet-download.c
 -src/fs/gnunet-fs.c
  src/fs/gnunet-fs-profiler.c
 +src/fs/gnunet-fs.c
  src/fs/gnunet-helper-fs-publish.c
  src/fs/gnunet-publish.c
  src/fs/gnunet-search.c
@@@ -169,10 -162,10 +169,10 @@@ src/fs/plugin_block_fs.
  src/gns/gns_api.c
  src/gns/gnunet-bcd.c
  src/gns/gnunet-dns2gns.c
 -src/gns/gnunet-gns.c
  src/gns/gnunet-gns-helper-service-w32.c
  src/gns/gnunet-gns-import.c
  src/gns/gnunet-gns-proxy.c
 +src/gns/gnunet-gns.c
  src/gns/gnunet-service-gns.c
  src/gns/gnunet-service-gns_interceptor.c
  src/gns/gnunet-service-gns_resolver.c
@@@ -181,44 -174,41 +181,44 @@@ src/gns/nss/nss_gns_query.
  src/gns/plugin_block_gns.c
  src/gns/plugin_gnsrecord_gns.c
  src/gns/plugin_rest_gns.c
 +src/gns/w32nsp-install.c
 +src/gns/w32nsp-resolve.c
 +src/gns/w32nsp-uninstall.c
 +src/gns/w32nsp.c
  src/gnsrecord/gnsrecord.c
  src/gnsrecord/gnsrecord_crypto.c
  src/gnsrecord/gnsrecord_misc.c
  src/gnsrecord/gnsrecord_serialization.c
  src/gnsrecord/plugin_gnsrecord_dns.c
 -src/gns/w32nsp.c
 -src/gns/w32nsp-install.c
 -src/gns/w32nsp-resolve.c
 -src/gns/w32nsp-uninstall.c
  src/hello/address.c
  src/hello/gnunet-hello.c
  src/hello/hello.c
  src/hostlist/gnunet-daemon-hostlist.c
  src/hostlist/gnunet-daemon-hostlist_client.c
  src/hostlist/gnunet-daemon-hostlist_server.c
 +src/identity-attribute/identity_attribute.c
 +src/identity-attribute/plugin_identity_attribute_gnuid.c
 +src/identity-provider/gnunet-idp.c
 +src/identity-provider/gnunet-service-identity-provider.c
 +src/identity-provider/identity_provider_api.c
 +src/identity-provider/jwt.c
 +src/identity-provider/plugin_gnsrecord_identity_provider.c
 +src/identity-provider/plugin_identity_provider_sqlite.c
 +src/identity-provider/plugin_rest_identity_provider.c
  src/identity/gnunet-identity.c
  src/identity/gnunet-service-identity.c
  src/identity/identity_api.c
  src/identity/identity_api_lookup.c
 -src/identity/plugin_gnsrecord_identity.c
  src/identity/plugin_rest_identity.c
 -src/identity-provider/gnunet-identity-token.c
 -src/identity-provider/gnunet-service-identity-provider.c
 -src/identity-provider/identity_provider_api.c
 -src/identity-provider/identity_token.c
 -src/identity-provider/plugin_rest_identity_provider.c
 +src/json/json.c
 +src/json/json_generator.c
 +src/json/json_helper.c
 +src/json/json_mhd.c
  src/jsonapi/jsonapi.c
  src/jsonapi/jsonapi_document.c
  src/jsonapi/jsonapi_error.c
  src/jsonapi/jsonapi_relationship.c
  src/jsonapi/jsonapi_resource.c
 -src/json/json.c
 -src/json/json_generator.c
 -src/json/json_helper.c
 -src/json/json_mhd.c
  src/multicast/gnunet-multicast.c
  src/multicast/gnunet-service-multicast.c
  src/multicast/multicast_api.c
@@@ -232,8 -222,8 +232,8 @@@ src/namecache/namecache_api.
  src/namecache/plugin_namecache_flat.c
  src/namecache/plugin_namecache_postgres.c
  src/namecache/plugin_namecache_sqlite.c
 -src/namestore/gnunet-namestore.c
  src/namestore/gnunet-namestore-fcfsd.c
 +src/namestore/gnunet-namestore.c
  src/namestore/gnunet-service-namestore.c
  src/namestore/namestore_api.c
  src/namestore/namestore_api_monitor.c
@@@ -248,10 -238,10 +248,10 @@@ src/nat-auto/gnunet-service-nat-auto.
  src/nat-auto/gnunet-service-nat-auto_legacy.c
  src/nat-auto/nat_auto_api.c
  src/nat-auto/nat_auto_api_test.c
 -src/nat/gnunet-helper-nat-client.c
  src/nat/gnunet-helper-nat-client-windows.c
 -src/nat/gnunet-helper-nat-server.c
 +src/nat/gnunet-helper-nat-client.c
  src/nat/gnunet-helper-nat-server-windows.c
 +src/nat/gnunet-helper-nat-server.c
  src/nat/gnunet-nat.c
  src/nat/gnunet-service-nat.c
  src/nat/gnunet-service-nat_externalip.c
@@@ -260,15 -250,15 +260,15 @@@ src/nat/gnunet-service-nat_mini.
  src/nat/gnunet-service-nat_stun.c
  src/nat/nat_api.c
  src/nat/nat_api_stun.c
 -src/nse/gnunet-nse.c
  src/nse/gnunet-nse-profiler.c
 +src/nse/gnunet-nse.c
  src/nse/gnunet-service-nse.c
  src/nse/nse_api.c
 +src/peerinfo-tool/gnunet-peerinfo.c
 +src/peerinfo-tool/gnunet-peerinfo_plugins.c
  src/peerinfo/gnunet-service-peerinfo.c
  src/peerinfo/peerinfo_api.c
  src/peerinfo/peerinfo_api_notify.c
 -src/peerinfo-tool/gnunet-peerinfo.c
 -src/peerinfo-tool/gnunet-peerinfo_plugins.c
  src/peerstore/gnunet-peerstore.c
  src/peerstore/gnunet-service-peerstore.c
  src/peerstore/peerstore_api.c
@@@ -316,17 -306,16 +316,16 @@@ src/revocation/revocation_api.
  src/rps/gnunet-rps.c
  src/rps/gnunet-service-rps.c
  src/rps/gnunet-service-rps_custommap.c
- src/rps/gnunet-service-rps_peers.c
  src/rps/gnunet-service-rps_sampler.c
  src/rps/gnunet-service-rps_sampler_elem.c
  src/rps/gnunet-service-rps_view.c
 -src/rps/rps_api.c
  src/rps/rps-test_util.c
 +src/rps/rps_api.c
  src/scalarproduct/gnunet-scalarproduct.c
 -src/scalarproduct/gnunet-service-scalarproduct_alice.c
 -src/scalarproduct/gnunet-service-scalarproduct_bob.c
  src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
  src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 +src/scalarproduct/gnunet-service-scalarproduct_alice.c
 +src/scalarproduct/gnunet-service-scalarproduct_bob.c
  src/scalarproduct/scalarproduct_api.c
  src/secretsharing/gnunet-secretsharing-profiler.c
  src/secretsharing/gnunet-service-secretsharing.c
@@@ -353,16 -342,15 +352,16 @@@ src/statistics/gnunet-statistics.
  src/statistics/statistics_api.c
  src/template/gnunet-service-template.c
  src/template/gnunet-template.c
 +src/testbed-logger/gnunet-service-testbed-logger.c
 +src/testbed-logger/testbed_logger_api.c
  src/testbed/generate-underlay-topology.c
  src/testbed/gnunet-daemon-latency-logger.c
  src/testbed/gnunet-daemon-testbed-blacklist.c
  src/testbed/gnunet-daemon-testbed-underlay.c
  src/testbed/gnunet-helper-testbed.c
 -src/testbed/gnunet_mpi_test.c
  src/testbed/gnunet-service-test-barriers.c
 -src/testbed/gnunet-service-testbed_barriers.c
  src/testbed/gnunet-service-testbed.c
 +src/testbed/gnunet-service-testbed_barriers.c
  src/testbed/gnunet-service-testbed_cache.c
  src/testbed/gnunet-service-testbed_connectionpool.c
  src/testbed/gnunet-service-testbed_cpustatus.c
@@@ -370,19 -358,20 +369,19 @@@ src/testbed/gnunet-service-testbed_link
  src/testbed/gnunet-service-testbed_meminfo.c
  src/testbed/gnunet-service-testbed_oc.c
  src/testbed/gnunet-service-testbed_peers.c
 -src/testbed/gnunet_testbed_mpi_spawn.c
  src/testbed/gnunet-testbed-profiler.c
 -src/testbed-logger/gnunet-service-testbed-logger.c
 -src/testbed-logger/testbed_logger_api.c
 -src/testbed/testbed_api_barriers.c
 +src/testbed/gnunet_mpi_test.c
 +src/testbed/gnunet_testbed_mpi_spawn.c
  src/testbed/testbed_api.c
 +src/testbed/testbed_api_barriers.c
  src/testbed/testbed_api_hosts.c
  src/testbed/testbed_api_operations.c
  src/testbed/testbed_api_peers.c
  src/testbed/testbed_api_sd.c
  src/testbed/testbed_api_services.c
  src/testbed/testbed_api_statistics.c
 -src/testbed/testbed_api_testbed.c
  src/testbed/testbed_api_test.c
 +src/testbed/testbed_api_testbed.c
  src/testbed/testbed_api_topology.c
  src/testbed/testbed_api_underlay.c
  src/testing/gnunet-testing.c
@@@ -391,39 -380,34 +390,39 @@@ src/testing/testing.
  src/topology/friends.c
  src/topology/gnunet-daemon-topology.c
  src/transport/gnunet-helper-transport-bluetooth.c
 -src/transport/gnunet-helper-transport-wlan.c
  src/transport/gnunet-helper-transport-wlan-dummy.c
 -src/transport/gnunet-service-transport_ats.c
 +src/transport/gnunet-helper-transport-wlan.c
  src/transport/gnunet-service-transport.c
 +src/transport/gnunet-service-transport_ats.c
  src/transport/gnunet-service-transport_hello.c
  src/transport/gnunet-service-transport_manipulation.c
  src/transport/gnunet-service-transport_neighbours.c
  src/transport/gnunet-service-transport_plugins.c
  src/transport/gnunet-service-transport_validation.c
 -src/transport/gnunet-transport.c
  src/transport/gnunet-transport-certificate-creation.c
  src/transport/gnunet-transport-profiler.c
  src/transport/gnunet-transport-wlan-receiver.c
  src/transport/gnunet-transport-wlan-sender.c
 +src/transport/gnunet-transport.c
  src/transport/plugin_transport_http_client.c
  src/transport/plugin_transport_http_common.c
  src/transport/plugin_transport_http_server.c
  src/transport/plugin_transport_smtp.c
  src/transport/plugin_transport_tcp.c
  src/transport/plugin_transport_template.c
 -src/transport/plugin_transport_udp_broadcasting.c
  src/transport/plugin_transport_udp.c
 +src/transport/plugin_transport_udp_broadcasting.c
  src/transport/plugin_transport_unix.c
  src/transport/plugin_transport_wlan.c
  src/transport/tcp_connection_legacy.c
  src/transport/tcp_server_legacy.c
  src/transport/tcp_server_mst_legacy.c
  src/transport/tcp_service_legacy.c
 +src/transport/transport-testing-filenames.c
 +src/transport/transport-testing-loggers.c
 +src/transport/transport-testing-main.c
 +src/transport/transport-testing-send.c
 +src/transport/transport-testing.c
  src/transport/transport_api_address_to_string.c
  src/transport/transport_api_blacklist.c
  src/transport/transport_api_core.c
@@@ -432,6 -416,11 +431,6 @@@ src/transport/transport_api_manipulatio
  src/transport/transport_api_monitor_peers.c
  src/transport/transport_api_monitor_plugins.c
  src/transport/transport_api_offer_hello.c
 -src/transport/transport-testing.c
 -src/transport/transport-testing-filenames.c
 -src/transport/transport-testing-loggers.c
 -src/transport/transport-testing-main.c
 -src/transport/transport-testing-send.c
  src/tun/regex.c
  src/tun/tun.c
  src/util/bandwidth.c
@@@ -445,11 -434,10 +444,11 @@@ src/util/configuration_loader.
  src/util/container_bloomfilter.c
  src/util/container_heap.c
  src/util/container_meta_data.c
 -src/util/container_multihashmap32.c
  src/util/container_multihashmap.c
 +src/util/container_multihashmap32.c
  src/util/container_multipeermap.c
  src/util/container_multishortmap.c
 +src/util/crypto_abe.c
  src/util/crypto_crc.c
  src/util/crypto_ecc.c
  src/util/crypto_ecc_dlog.c
@@@ -466,8 -454,8 +465,8 @@@ src/util/crypto_symmetric.
  src/util/disk.c
  src/util/getopt.c
  src/util/getopt_helpers.c
 -src/util/gnunet-config.c
  src/util/gnunet-config-diff.c
 +src/util/gnunet-config.c
  src/util/gnunet-ecc.c
  src/util/gnunet-helper-w32-console.c
  src/util/gnunet-resolver.c
@@@ -498,8 -486,8 +497,8 @@@ src/util/time.
  src/util/w32cat.c
  src/util/win.c
  src/util/winproc.c
 -src/vpn/gnunet-helper-vpn.c
  src/vpn/gnunet-helper-vpn-windows.c
 +src/vpn/gnunet-helper-vpn.c
  src/vpn/gnunet-service-vpn.c
  src/vpn/gnunet-vpn.c
  src/vpn/vpn_api.c

diff --combined src/include/gnunet_protocols.h
index 6710d749f13e6dadb4bc174411161305b2b771d0,9cfd00e394e32d43320645036c000851147d84b1..436adc5a4497cc5fd18e0b01c70b0066bf10f8cd
--- 1/src/include/gnunet_protocols.h
--- 2/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@@ -2067,7 -2067,11 +2067,11 @@@ extern "C
  /** S->C: slave join acknowledgement */
  #define GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN_ACK 684
  
- /* 685-686 */
+ /** C->S: request to part from a channel */
+ #define GNUNET_MESSAGE_TYPE_PSYC_PART_REQUEST 685
+ 
+ /** S->C: acknowledgement that a slave of master parted from a channel */
+ #define GNUNET_MESSAGE_TYPE_PSYC_PART_ACK 686
  
  /** M->S->C: incoming join request from multicast */
  #define GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST 687
@@@ -2258,6 -2262,7 +2262,7 @@@
   */
  #define GNUNET_MESSAGE_TYPE_MULTICAST_PART_ACK 755
  
+ // FIXME: this is never used!
  /**
   * Group terminated.
   */
@@@ -2398,35 -2403,38 +2403,38 @@@
  /** C->S: request to leave a place */
  #define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE 848
  
+ /** S->C: place leave acknowledgement */
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE_ACK 849
+ 
  /** C->S: add place to GNS zone */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_PLACE 849
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_PLACE 850
  
  /** C->S: add nym to GNS zone */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_NYM 850
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_NYM 851
  
  /** C->S: connect application */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_CONNECT 851
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_CONNECT 852
  
  /** C->S: detach a place from application */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH 852
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH 853
  
  /** S->C: notify about an existing ego */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO 853
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO 854
  
  /** S->C: end of ego list */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END 854
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END 855
  
  /** S->C: notify about an existing place */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE 855
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE 856
  
  /** S->C: end of place list */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END 856
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END 857
  
  /** C->S: set message processing flags */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET 860
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET 858
  
  /** C->S: clear message processing flags */
- #define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR 861
+ #define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR 859
  
  /*******************************************************************************
   * X-VINE DHT messages
@@@ -2620,47 -2628,13 +2628,47 @@@
   *
   * IDENTITY PROVIDER MESSAGE TYPES
   */
 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE     961
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 961
  
 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE  962
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 962
  
 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_RESULT     963
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 963
  
 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE_RESULT  964
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 964
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 965
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 966
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET 967
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 968
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET 969
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT 970
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 971
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 972
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 973
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 974
 +
 +#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 975
 +
 +/**************************************************
 + *
 + * CREDENTIAL MESSAGE TYPES
 + */
 +#define GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY     981
 +
 +#define GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT 982
 +
 +#define GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT 983
 +
 +#define GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT 984
  
  /******************************************************************************/