-fix assertion checking the encoded s-expressions

2 files changed, 10 insertions, 3 deletions

diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index c14e6b9b1..9aad9c910 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -199,7 +199,7 @@ GNUNET_CRYPTO_rsa_private_key_encode (const struct GNUNET_CRYPTO_rsa_PrivateKey
                         NULL,
                         0);
   b = GNUNET_malloc (n);
-  GNUNET_assert (n ==
+  GNUNET_assert ((n - 1) ==     /* since the last byte is \0 */
                  gcry_sexp_sprint (key->sexp,
                                    GCRYSEXP_FMT_DEFAULT,
                                    b,
@@ -309,7 +309,7 @@ GNUNET_CRYPTO_rsa_public_key_encode (const struct GNUNET_CRYPTO_rsa_PublicKey *k
                         NULL,
                         0);
   b = GNUNET_malloc (n);
-  GNUNET_assert (n ==
+  GNUNET_assert ((n -1) ==      /* since the last byte is \0 */
                  gcry_sexp_sprint (key->sexp,
                                    GCRYSEXP_FMT_ADVANCED,
                                    b,
@@ -636,7 +636,7 @@ GNUNET_CRYPTO_rsa_signature_encode (const struct GNUNET_CRYPTO_rsa_Signature *si
                         NULL,
                         0);
   b = GNUNET_malloc (n);
-  GNUNET_assert (n ==
+  GNUNET_assert ((n - 1) ==     /* since the last byte is \0 */
                  gcry_sexp_sprint (sig->sexp,
                                    GCRYSEXP_FMT_ADVANCED,
                                    b,
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index e58a0960a..156d40ed4 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -49,6 +49,13 @@ main (int argc,
                       &hash);
   priv = GNUNET_CRYPTO_rsa_private_key_create (KEY_SIZE);
   pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
+  /* Encoding */
+  size_t size;
+  char *enc;
+  enc = NULL;
+  size = GNUNET_CRYPTO_rsa_private_key_encode (priv, &enc);
+  GNUNET_free (enc);
+  
   /* try ordinary sig first */
   sig = GNUNET_CRYPTO_rsa_sign (priv,
                         &hash,