Implement and use GNUNET_CRYPTO_rsa_get_public_key_hash

5 files changed, 30 insertions, 15 deletions

diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 46121aa9c..9781cf6b7 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -509,7 +509,6 @@ process_namespace (void *cls, const char *filename)
 {
   struct ProcessNamespaceContext *pnc = cls;
   struct GNUNET_CRYPTO_RsaPrivateKey *key;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pk;
   struct GNUNET_HashCode id;
   const char *name;
   const char *t;
@@ -525,9 +524,8 @@ process_namespace (void *cls, const char *filename)
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
     return GNUNET_OK;
   }
-  GNUNET_CRYPTO_rsa_key_get_public (key, &pk);
+  GNUNET_CRYPTO_rsa_get_public_key_hash (key, &id);
   GNUNET_CRYPTO_rsa_key_free (key);
-  GNUNET_CRYPTO_hash (&pk, sizeof (pk), &id);
   name = filename;
   while (NULL != (t = strstr (name, DIR_SEPARATOR_STR)))
     name = t + 1;
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index ffa2d61aa..718af912a 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -1304,12 +1304,7 @@ GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc)
       GNUNET_CRYPTO_hash (keyword, strlen (keyword), &hc);
       pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&hc);
       GNUNET_assert (NULL != pk);
-      GNUNET_CRYPTO_rsa_key_get_public (pk, &pub);
-      GNUNET_CRYPTO_rsa_key_free (pk);
-      GNUNET_CRYPTO_hash (&pub,
-                          sizeof (struct
-                                  GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                          &sc->requests[i].query);
+      GNUNET_CRYPTO_rsa_get_public_key_hash (pk, &sc->requests[i].query);
       sc->requests[i].mandatory = (sc->uri->data.ksk.keywords[i][0] == '+');
       if (sc->requests[i].mandatory)
         sc->mandatory_count++;
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 221760328..028ded44a 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -571,12 +571,7 @@ GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc)
   GNUNET_CRYPTO_hash (keyword, strlen (keyword), &uc->key);
   pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&uc->key);
   GNUNET_assert (pk != NULL);
-  GNUNET_CRYPTO_rsa_key_get_public (pk, &pub);
-  GNUNET_CRYPTO_rsa_key_free (pk);
-  GNUNET_CRYPTO_hash (&pub,
-                      sizeof (struct
-                              GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                      &uc->query);
+  GNUNET_CRYPTO_rsa_get_public_key_hash (pk, &uc->query);
   uc->first_uid = 0;
   uc->dqe = GNUNET_DATASTORE_get_key (uc->dsh,
                                       uc->roff++,
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 99d4ac58f..8c7f31010 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -1081,6 +1081,17 @@ GNUNET_CRYPTO_rsa_key_get_public (const struct GNUNET_CRYPTO_RsaPrivateKey
 
 
 /**
+ * Get hash of the public key that corresponds to a private key.
+ *
+ * @param key RSA private key
+ * @param id buffer for hash of the public key
+ */
+void
+GNUNET_CRYPTO_rsa_get_public_key_hash (struct GNUNET_CRYPTO_RsaPrivateKey *key,
+    struct GNUNET_HashCode *id);
+
+
+/**
  * Encrypt a block with the public key of another host that uses the
  * same cyper.
  *
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 6857a1221..07eff6696 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -195,6 +195,22 @@ GNUNET_CRYPTO_rsa_key_get_public (const struct GNUNET_CRYPTO_RsaPrivateKey
 
 
 /**
+ * Get hash of the public key that corresponds to a private key.
+ *
+ * @param key RSA private key
+ * @param id buffer for hash of the public key
+ */
+void
+GNUNET_CRYPTO_rsa_get_public_key_hash (struct GNUNET_CRYPTO_RsaPrivateKey *key,
+    struct GNUNET_HashCode *id)
+{
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pk;
+  GNUNET_CRYPTO_rsa_key_get_public (key, &pk);
+  GNUNET_CRYPTO_hash (&pk, sizeof (pk), id);
+}
+
+
+/**
  * Convert a public key to a string.
  *
  * @param pub key to convert