[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26261 - in gnunet/src: fs include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26261 - in gnunet/src: fs include util |
Date: |
Sun, 3 Mar 2013 02:57:04 +0100 |
Author: LRN
Date: 2013-03-03 02:57:04 +0100 (Sun, 03 Mar 2013)
New Revision: 26261
Modified:
gnunet/src/fs/fs_namespace.c
gnunet/src/fs/fs_search.c
gnunet/src/fs/fs_unindex.c
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/util/crypto_rsa.c
Log:
Implement and use GNUNET_CRYPTO_rsa_get_public_key_hash
Modified: gnunet/src/fs/fs_namespace.c
===================================================================
--- gnunet/src/fs/fs_namespace.c 2013-03-02 22:40:58 UTC (rev 26260)
+++ gnunet/src/fs/fs_namespace.c 2013-03-03 01:57:04 UTC (rev 26261)
@@ -509,7 +509,6 @@
{
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 @@
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;
Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c 2013-03-02 22:40:58 UTC (rev 26260)
+++ gnunet/src/fs/fs_search.c 2013-03-03 01:57:04 UTC (rev 26261)
@@ -1304,12 +1304,7 @@
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++;
Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c 2013-03-02 22:40:58 UTC (rev 26260)
+++ gnunet/src/fs/fs_unindex.c 2013-03-03 01:57:04 UTC (rev 26261)
@@ -571,12 +571,7 @@
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++,
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2013-03-02 22:40:58 UTC (rev
26260)
+++ gnunet/src/include/gnunet_crypto_lib.h 2013-03-03 01:57:04 UTC (rev
26261)
@@ -1081,6 +1081,17 @@
/**
+ * 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.
*
Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c 2013-03-02 22:40:58 UTC (rev 26260)
+++ gnunet/src/util/crypto_rsa.c 2013-03-03 01:57:04 UTC (rev 26261)
@@ -195,6 +195,22 @@
/**
+ * 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26261 - in gnunet/src: fs include util,
gnunet <=