Implement and use GNUNET_FS_namespace_get_public_key_hash

2 files changed, 20 insertions, 2 deletions

diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 9781cf6b7..177af7efc 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -496,6 +496,25 @@ struct ProcessNamespaceContext
 
 
 /**
+ * Get hash of the public key of a namespace.
+ *
+ * @param ns namespace
+ * @param id buffer to store the key in
+ * @return GNUNET_OK on success
+ *         GNUNET_SYSERR on failure (contents of id remain intact)
+ */
+int
+GNUNET_FS_namespace_get_public_key_hash (struct GNUNET_FS_Namespace *ns,
+    struct GNUNET_HashCode *id)
+{
+  if ((NULL == ns) || (NULL == id))
+    return GNUNET_SYSERR;
+  GNUNET_CRYPTO_rsa_get_public_key_hash (ns->key, id);
+  return GNUNET_OK;
+}
+
+
+/**
  * Function called with a filename of a namespace. Reads the key and
  * calls the callback.
  *
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index d38a5354d..d929eec64 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -948,8 +948,7 @@ GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
 
   ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
   ns_uri->type = GNUNET_FS_URI_SKS;
-  GNUNET_CRYPTO_rsa_key_get_public (ns->key, &pk);
-  GNUNET_CRYPTO_hash (&pk, sizeof (pk), &ns_uri->data.sks.ns);
+  GNUNET_FS_namespace_get_public_key_hash (ns, &ns_uri->data.sks.ns);
   ns_uri->data.sks.identifier = GNUNET_strdup (id);
   return ns_uri;
 }