summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/experiments/nse/infiniband.conf1
-rw-r--r--contrib/testbed_configs/regex_profiler_infiniband.conf3
-rw-r--r--contrib/testbed_configs/testbed_cluster.conf1
-rw-r--r--contrib/testbed_configs/testbed_infiniband.conf1
-rw-r--r--contrib/testbed_configs/testbed_supermuc.conf1
-rw-r--r--doc/man/gnunet.conf.57
-rw-r--r--src/arm/arm.conf.in3
-rw-r--r--src/include/gnunet_crypto_lib.h10
-rw-r--r--src/rps/Makefile.am1
-rw-r--r--src/testbed/test_testbed_underlay.conf.in3
-rw-r--r--src/util/crypto_rsa.c28
-rw-r--r--src/util/os_network.c3
12 files changed, 42 insertions, 20 deletions
diff --git a/contrib/experiments/nse/infiniband.conf b/contrib/experiments/nse/infiniband.conf
index 1720e0131..e42baba95 100644
--- a/contrib/experiments/nse/infiniband.conf
+++ b/contrib/experiments/nse/infiniband.conf
@@ -26,7 +26,6 @@ WORKBITS = 0
PROOFFILE = $SERVICEHOME/nse.proof
[arm]
-DEFAULTSERVICES = core nse
UNIXPATH = /tmp/test-nse-service-arm.unix
[statistics]
diff --git a/contrib/testbed_configs/regex_profiler_infiniband.conf b/contrib/testbed_configs/regex_profiler_infiniband.conf
index e4d6138ca..206423011 100644
--- a/contrib/testbed_configs/regex_profiler_infiniband.conf
+++ b/contrib/testbed_configs/regex_profiler_infiniband.conf
@@ -40,9 +40,6 @@ DISABLE_BF = YES
# Keep datacache in-memory? (reduces IO)
IN_MEMORY = YES
-[arm]
-DEFAULTSERVICES = core cadet dht statistics regexprofiler
-
[fs]
AUTOSTART = NO
diff --git a/contrib/testbed_configs/testbed_cluster.conf b/contrib/testbed_configs/testbed_cluster.conf
index d55761f10..6d646a0ce 100644
--- a/contrib/testbed_configs/testbed_cluster.conf
+++ b/contrib/testbed_configs/testbed_cluster.conf
@@ -46,7 +46,6 @@ AUTOSTART = YES
USE_EPHEMERAL_KEYS = NO
[arm]
-DEFAULTSERVICES = core transport
#PORT = 12366
DEBUG = NO
diff --git a/contrib/testbed_configs/testbed_infiniband.conf b/contrib/testbed_configs/testbed_infiniband.conf
index aea11a18e..7ad50d77a 100644
--- a/contrib/testbed_configs/testbed_infiniband.conf
+++ b/contrib/testbed_configs/testbed_infiniband.conf
@@ -46,7 +46,6 @@ AUTOSTART = YES
USE_EPHEMERAL_KEYS = NO
[arm]
-DEFAULTSERVICES = core
#PORT = 12366
DEBUG = NO
diff --git a/contrib/testbed_configs/testbed_supermuc.conf b/contrib/testbed_configs/testbed_supermuc.conf
index 02d64d62f..35c6e0789 100644
--- a/contrib/testbed_configs/testbed_supermuc.conf
+++ b/contrib/testbed_configs/testbed_supermuc.conf
@@ -49,7 +49,6 @@ AUTOSTART = YES
USE_EPHEMERAL_KEYS = NO
[arm]
-DEFAULTSERVICES = transport core ats
#PORT = 12366
DEBUG = NO
#PREFIX = strace -r -T -o /${WORK}/trace/${PEERID}.strace
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index d668c81fa..2ef88c11e 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -75,15 +75,16 @@ This example is a simple way to get started, using a server that has a known lis
OPTIONS = \-b
SERVERS = http://v9.gnunet.org:58080/
- [arm]
- DEFAULTSERVICES = topology hostlist fs
-
[nat]
BEHIND_NAT = YES
ENABLE_UPNP = YES
DISABLEV6 = YES
EXTERNAL_ADDRESS = 157.166.249.10
+ [arm]
+ SYSTEM_ONLY = YES
+ USER_ONLY = NO
+
.SH FILES
.TP
~/.config/gnunet.conf
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 53731586b..20d3e1dc0 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -5,9 +5,6 @@ BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-
-DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
-
# Special case, uses user runtime dir even for per-system service.
UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
UNIX_MATCH_UID = YES
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 38a3ab3b6..eb28b8ffd 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -1753,6 +1753,16 @@ GNUNET_CRYPTO_rsa_public_key_hash (const struct GNUNET_CRYPTO_rsa_PublicKey *key
/**
+ * Obtain the length of the RSA key in bits.
+ *
+ * @param key the public key to introspect
+ * @return length of the key in bits
+ */
+unsigned int
+GNUNET_CRYPTO_rsa_public_key_len (const struct GNUNET_CRYPTO_rsa_PublicKey *key);
+
+
+/**
* Free memory occupied by the public key.
*
* @param key pointer to the memory to free
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index 09369dc73..b1fd3d47b 100644
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -112,4 +112,3 @@ gnunet_rps_profiler_LDADD = $(ld_rps_test_lib)
EXTRA_DIST = \
test_rps.conf
-
diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in
index 4da34b89b..5799b5253 100644
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -11,6 +11,3 @@ FORCESTART = YES
[dv]
AUTOSTART = NO
-
-[arm]
-DEFAULTSERVICES = core transport testbed-underlay
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index d1ca760cf..58503b734 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -527,6 +527,32 @@ GNUNET_CRYPTO_rsa_private_key_cmp (struct GNUNET_CRYPTO_rsa_PrivateKey *p1,
/**
+ * Obtain the length of the RSA key in bits.
+ *
+ * @param key the public key to introspect
+ * @return length of the key in bits
+ */
+unsigned int
+GNUNET_CRYPTO_rsa_public_key_len (const struct GNUNET_CRYPTO_rsa_PublicKey *key)
+{
+ gcry_mpi_t n;
+ int ret;
+ unsigned int rval;
+
+ ret = key_from_sexp (&n, key->sexp, "rsa", "n");
+ if (0 != ret)
+ {
+ /* this is no public RSA key */
+ GNUNET_break (0);
+ return 0;
+ }
+ rval = gcry_mpi_get_nbits (n);
+ gcry_mpi_release (n);
+ return rval;
+}
+
+
+/**
* Destroy a blinding key
*
* @param bkey the blinding key to destroy
@@ -549,7 +575,7 @@ GNUNET_CRYPTO_rsa_blinding_key_free (struct GNUNET_CRYPTO_rsa_BlindingKey *bkey)
*/
size_t
GNUNET_CRYPTO_rsa_blinding_key_encode (const struct GNUNET_CRYPTO_rsa_BlindingKey *bkey,
- char **buffer)
+ char **buffer)
{
size_t n;
char *b;
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 715fe5bd6..19b60b6b4 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -18,7 +18,6 @@
Boston, MA 02110-1301, USA.
*/
-
/**
* @file util/os_network.c
* @brief function to determine available network interfaces
@@ -38,7 +37,7 @@
* @brief Enumerate all network interfaces
*
* @param proc the callback function
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
*/
void
GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,