2 files changed, 35 insertions, 2 deletions

diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 019dbe94e..ef52d9588 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -388,6 +388,39 @@ GNUNET_CRYPTO_ecdsa_public_key_from_string (
 
 
 /**
+ * Convert a string representing a private key to a private key.
+ *
+ * @param enc encoded private key
+ * @param enclen number of bytes in @a enc (without 0-terminator)
+ * @param priv where to store the private key
+ * @return #GNUNET_OK on success
+ */
+int
+GNUNET_CRYPTO_ecdsa_private_key_from_string (
+  const char *enc,
+  size_t enclen,
+  struct GNUNET_CRYPTO_EcdsaPrivateKey *priv)
+{
+  size_t keylen = (sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey)) * 8;
+
+  if (keylen % 5 > 0)
+    keylen += 5 - keylen % 5;
+  keylen /= 5;
+  if (enclen != keylen)
+    return GNUNET_SYSERR;
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (enc,
+                                     enclen,
+                                     priv,
+                                     sizeof(
+                                       struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+/**
  * Convert a string representing a public key to a public key.
  *
  * @param enc encoded public key
@@ -423,7 +456,7 @@ GNUNET_CRYPTO_eddsa_public_key_from_string (
 /**
  * Convert a string representing a private key to a private key.
  *
- * @param enc encoded public key
+ * @param enc encoded private key
  * @param enclen number of bytes in @a enc (without 0-terminator)
  * @param priv where to store the private key
  * @return #GNUNET_OK on success
diff --git a/src/util/strings.c b/src/util/strings.c
index 9d6f4039e..014302c01 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -2148,7 +2148,7 @@ GNUNET_STRINGS_urlencode (const char *data, size_t len, char **out)
   struct GNUNET_Buffer buf = { 0 };
   const uint8_t *i8 = (uint8_t *) data;
 
-  while (0 != *i8)
+  while ((i8 - (uint8_t *) data) < len && 0 != *i8)
   {
     if (0 == (0x80 & *i8))
     {