aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-12-07 15:06:54 +0100
committerChristian Grothoff <christian@grothoff.org>2019-12-07 15:06:54 +0100
commit4e59b8e69f79ded079430e73f7ee023dd26f7c0f (patch)
treef455f26eec737a313ece2a2a7b7356a59ff6e52b /src
parentb365e4d52a723b48bb018a8c2dbfc8fe1050988a (diff)
downloadgnunet-4e59b8e69f79ded079430e73f7ee023dd26f7c0f.tar.gz
gnunet-4e59b8e69f79ded079430e73f7ee023dd26f7c0f.zip
fix libgnunetpq for RSA encoding
Diffstat (limited to 'src')
-rw-r--r--src/pq/pq_query_helper.c2
-rw-r--r--src/util/crypto_rsa.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 3bc84082d..34de97eb3 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -304,7 +304,7 @@ qconv_rsa_public_key (void *cls,
304 &buf); 304 &buf);
305 scratch[0] = buf; 305 scratch[0] = buf;
306 param_values[0] = (void *) buf; 306 param_values[0] = (void *) buf;
307 param_lengths[0] = buf_size - 1; /* DB doesn't like the trailing \0 */ 307 param_lengths[0] = buf_size;
308 param_formats[0] = 1; 308 param_formats[0] = 1;
309 return 1; 309 return 1;
310} 310}
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 2ac4fcf8a..5bea87793 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -356,7 +356,6 @@ GNUNET_CRYPTO_rsa_public_key_encode (const struct
356 struct GNUNET_CRYPTO_RsaPublicKeyHeaderP hdr; 356 struct GNUNET_CRYPTO_RsaPublicKeyHeaderP hdr;
357 int ret; 357 int ret;
358 358
359/* SEE #5398 / #5968 */
360 ret = key_from_sexp (ne, key->sexp, "public-key", "ne"); 359 ret = key_from_sexp (ne, key->sexp, "public-key", "ne");
361 if (0 != ret) 360 if (0 != ret)
362 ret = key_from_sexp (ne, key->sexp, "rsa", "ne"); 361 ret = key_from_sexp (ne, key->sexp, "rsa", "ne");
@@ -366,7 +365,6 @@ GNUNET_CRYPTO_rsa_public_key_encode (const struct
366 *buffer = NULL; 365 *buffer = NULL;
367 return 0; 366 return 0;
368 } 367 }
369
370 gcry_mpi_print (GCRYMPI_FMT_USG, 368 gcry_mpi_print (GCRYMPI_FMT_USG,
371 NULL, 369 NULL,
372 0, 370 0,