From dc08cf45466193ee67fbbe97cddee413f0273cff Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 13 Apr 2015 20:26:36 +0000 Subject: -doxygen, build system fixes, minor API extension --- configure.ac | 4 +- po/POTFILES.in | 95 +++++++++++++++++++++-------------------- src/include/gnunet_crypto_lib.h | 16 ++++++- src/util/crypto_rsa.c | 16 +++++++ src/util/getopt_helpers.c | 34 +++++++++------ 5 files changed, 100 insertions(+), 65 deletions(-) diff --git a/configure.ac b/configure.ac index 30edf6285..b1105c1af 100644 --- a/configure.ac +++ b/configure.ac @@ -1242,7 +1242,7 @@ AC_ARG_ENABLE([malicious], [malicious=0 enable_malicious=no]) AC_MSG_RESULT($enable_malicious) -AM_CONDITIONAL([ENABLE_MALICIOUS], [1=$malicious]) +AM_CONDITIONAL([ENABLE_MALICIOUS], [test 1=$malicious]) AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious], [enable compilation of malicious code]) @@ -1639,7 +1639,7 @@ then fi # conversation -if test "x$conversation_backend" == "xnone" +if test "x$conversation_backend" = "xnone" then if test "x$pulse" != "x1" then diff --git a/po/POTFILES.in b/po/POTFILES.in index 561b834a5..a5d340942 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,13 +3,21 @@ src/arm/arm_monitor_api.c 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_feedback.c src/ats/gnunet-service-ats_normalization.c @@ -21,14 +29,6 @@ src/ats/gnunet-service-ats_scheduling.c 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/block/block.c src/block/plugin_block_template.c src/block/plugin_block_test.c @@ -37,8 +37,8 @@ src/cadet/cadet_common.c src/cadet/cadet_path.c src/cadet/cadet_test_lib.c src/cadet/cadet_tunnel_tree.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 @@ -52,12 +52,12 @@ src/consensus/gnunet-consensus-profiler.c src/consensus/gnunet-service-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-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/microphone.c src/conversation/plugin_gnsrecord_conversation.c @@ -89,7 +89,6 @@ src/dht/dht_api.c 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 @@ -105,6 +104,7 @@ src/dht/gnunet-service-xdht_hello.c src/dht/gnunet-service-xdht_neighbours.c src/dht/gnunet-service-xdht_nse.c src/dht/gnunet-service-xdht_routing.c +src/dht/gnunet_dht_profiler.c src/dht/plugin_block_dht.c src/dns/dns_api.c src/dns/dnsparser.c @@ -120,8 +120,8 @@ src/dv/gnunet-service-dv.c src/dv/plugin_transport_dv.c src/env/env.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 @@ -146,8 +146,8 @@ src/fs/gnunet-auto-share.c 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 @@ -166,10 +166,10 @@ src/fs/plugin_block_fs.c 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 @@ -179,15 +179,15 @@ src/gns/nss/nss_gns_query.c 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 @@ -208,31 +208,31 @@ src/namecache/gnunet-service-namecache.c src/namecache/namecache_api.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 src/namestore/plugin_namestore_postgres.c src/namestore/plugin_namestore_sqlite.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-server.c -src/nat/nat_auto.c src/nat/nat.c +src/nat/nat_auto.c src/nat/nat_mini.c src/nat/nat_test.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 @@ -260,6 +260,7 @@ src/regex/regex_test_graph.c src/regex/regex_test_lib.c src/regex/regex_test_random.c src/rest/gnunet-rest-server.c +src/rest/rest.c src/revocation/gnunet-revocation.c src/revocation/gnunet-service-revocation.c src/revocation/revocation_api.c @@ -275,12 +276,10 @@ src/secretsharing/gnunet-secretsharing-profiler.c src/secretsharing/gnunet-service-secretsharing.c src/secretsharing/secretsharing_api.c src/secretsharing/secretsharing_common.c -src/sensordashboard/gnunet-sensordashboard.c -src/sensordashboard/gnunet-service-sensordashboard.c -src/sensor/gnunet-sensor.c src/sensor/gnunet-sensor-profiler.c -src/sensor/gnunet-service-sensor_analysis.c +src/sensor/gnunet-sensor.c src/sensor/gnunet-service-sensor.c +src/sensor/gnunet-service-sensor_analysis.c src/sensor/gnunet-service-sensor_monitoring.c src/sensor/gnunet-service-sensor_reporting.c src/sensor/gnunet-service-sensor_update.c @@ -288,6 +287,8 @@ src/sensor/plugin_sensor_model_gaussian.c src/sensor/sensor_api.c src/sensor/sensor_util_lib.c src/sensor/sensor_util_lib_crypto.c +src/sensordashboard/gnunet-sensordashboard.c +src/sensordashboard/gnunet-service-sensordashboard.c src/set/gnunet-service-set.c src/set/gnunet-service-set_intersection.c src/set/gnunet-service-set_union.c @@ -308,30 +309,30 @@ 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-logger.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 src/testbed/gnunet-service-testbed_links.c -src/testbed/gnunet-service-testbed-logger.c 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/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/testbed/testbed_logger_api.c @@ -341,39 +342,39 @@ src/testing/testing.c 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-helper-transport-wlan.c +src/transport/gnunet-service-transport.c src/transport/gnunet-service-transport_ats.c src/transport/gnunet-service-transport_blacklist.c -src/transport/gnunet-service-transport.c src/transport/gnunet-service-transport_clients.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/transport-testing.c +src/transport/transport_api.c src/transport/transport_api_address_to_string.c src/transport/transport_api_blacklist.c -src/transport/transport_api.c src/transport/transport_api_monitor_peers.c src/transport/transport_api_monitor_plugins.c src/transport/transport_api_monitor_validation.c -src/transport/transport-testing.c src/tun/regex.c src/tun/tun.c src/util/bandwidth.c @@ -388,8 +389,8 @@ src/util/connection.c 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/crypto_crc.c src/util/crypto_ecc.c @@ -404,8 +405,8 @@ src/util/crypto_symmetric.c 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 @@ -436,8 +437,8 @@ src/util/time.c 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 --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index ac50685e2..adc05b8a8 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h @@ -1664,6 +1664,18 @@ struct GNUNET_CRYPTO_rsa_BlindingKey * GNUNET_CRYPTO_rsa_blinding_key_create (unsigned int len); +/** + * Compare the values of two blinding keys. + * + * @param b1 one key + * @param b2 the other key + * @return 0 if the two are equal + */ +int +GNUNET_CRYPTO_rsa_blinding_key_cmp (struct GNUNET_CRYPTO_rsa_BlindingKey *b1, + struct GNUNET_CRYPTO_rsa_BlindingKey *b2); + + /** * Destroy a blinding key * @@ -1790,8 +1802,8 @@ GNUNET_CRYPTO_rsa_unblind (struct GNUNET_CRYPTO_rsa_Signature *sig, */ int GNUNET_CRYPTO_rsa_verify (const struct GNUNET_HashCode *hash, - const struct GNUNET_CRYPTO_rsa_Signature *sig, - const struct GNUNET_CRYPTO_rsa_PublicKey *public_key); + const struct GNUNET_CRYPTO_rsa_Signature *sig, + const struct GNUNET_CRYPTO_rsa_PublicKey *public_key); #if 0 /* keep Emacsens' auto-indent happy */ diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c index 66082fc9d..47aa798e7 100644 --- a/src/util/crypto_rsa.c +++ b/src/util/crypto_rsa.c @@ -405,6 +405,22 @@ GNUNET_CRYPTO_rsa_blinding_key_create (unsigned int len) } +/** + * Compare the values of two blinding keys. + * + * @param b1 one key + * @param b2 the other key + * @return 0 if the two are equal + */ +int +GNUNET_CRYPTO_rsa_blinding_key_cmp (struct GNUNET_CRYPTO_rsa_BlindingKey *b1, + struct GNUNET_CRYPTO_rsa_BlindingKey *b2) +{ + return gcry_mpi_cmp (b1->r, + b2->r); +} + + /** * Destroy a blinding key * diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index c9eb25f2f..c41f78235 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -36,21 +36,26 @@ * @param scls additional closure (points to version string) * @param option name of the option * @param value not used (NULL) - * @return GNUNET_NO (do not continue, not an error) + * @return #GNUNET_NO (do not continue, not an error) */ int -GNUNET_GETOPT_print_version_ (struct GNUNET_GETOPT_CommandLineProcessorContext - *ctx, void *scls, const char *option, +GNUNET_GETOPT_print_version_ (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, + void *scls, + const char *option, const char *value) { const char *version = scls; - printf ("%s v%s\n", ctx->binaryName, version); + printf ("%s v%s\n", + ctx->binaryName, + version); return GNUNET_NO; } - +/** + * At what offset does the help text start? + */ #define BORDER 29 /** @@ -60,11 +65,12 @@ GNUNET_GETOPT_print_version_ (struct GNUNET_GETOPT_CommandLineProcessorContext * @param scls additional closure (points to about text) * @param option name of the option * @param value not used (NULL) - * @return GNUNET_NO (do not continue, not an error) + * @return #GNUNET_NO (do not continue, not an error) */ int -GNUNET_GETOPT_format_help_ (struct GNUNET_GETOPT_CommandLineProcessorContext - *ctx, void *scls, const char *option, +GNUNET_GETOPT_format_help_ (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, + void *scls, + const char *option, const char *value) { const char *about = scls; @@ -166,7 +172,7 @@ OUTER: * @param scls additional closure (will point to the 'int') * @param option name of the option * @param value not used (NULL) - * @return GNUNET_OK + * @return #GNUNET_OK */ int GNUNET_GETOPT_increment_value (struct GNUNET_GETOPT_CommandLineProcessorContext @@ -192,7 +198,7 @@ GNUNET_GETOPT_increment_value (struct GNUNET_GETOPT_CommandLineProcessorContext * @param scls additional closure (will point to the 'int') * @param option name of the option * @param value not used (NULL) - * @return GNUNET_OK + * @return #GNUNET_OK */ int GNUNET_GETOPT_set_one (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, @@ -217,7 +223,7 @@ GNUNET_GETOPT_set_one (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, * which will be allocated) * @param option name of the option * @param value actual value of the option (a string) - * @return GNUNET_OK + * @return #GNUNET_OK */ int GNUNET_GETOPT_set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, @@ -255,7 +261,7 @@ GNUNET_GETOPT_set_filename (struct GNUNET_GETOPT_CommandLineProcessorContext *ct * @param scls additional closure (will point to the 'unsigned long long') * @param option name of the option * @param value actual value of the option as a string. - * @return GNUNET_OK if parsing the value worked + * @return #GNUNET_OK if parsing the value worked */ int GNUNET_GETOPT_set_ulong (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, @@ -283,7 +289,7 @@ GNUNET_GETOPT_set_ulong (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, * @param scls additional closure (will point to the 'struct GNUNET_TIME_Relative') * @param option name of the option * @param value actual value of the option as a string. - * @return GNUNET_OK if parsing the value worked + * @return #GNUNET_OK if parsing the value worked */ int GNUNET_GETOPT_set_relative_time (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, @@ -313,7 +319,7 @@ GNUNET_GETOPT_set_relative_time (struct GNUNET_GETOPT_CommandLineProcessorContex * @param scls additional closure (will point to the 'unsigned int') * @param option name of the option * @param value actual value of the option as a string. - * @return GNUNET_OK if parsing the value worked + * @return #GNUNET_OK if parsing the value worked */ int GNUNET_GETOPT_set_uint (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, -- cgit v1.2.3