[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29728 - in gnunet/src: include regex
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29728 - in gnunet/src: include regex |
Date: |
Mon, 30 Sep 2013 23:44:15 +0200 |
Author: grothoff
Date: 2013-09-30 23:44:15 +0200 (Mon, 30 Sep 2013)
New Revision: 29728
Modified:
gnunet/src/include/block_regex.h
gnunet/src/regex/plugin_block_regex.c
gnunet/src/regex/regex_internal_dht.c
Log:
-getting regex to compile again (part of #3047)
Modified: gnunet/src/include/block_regex.h
===================================================================
--- gnunet/src/include/block_regex.h 2013-09-30 21:41:59 UTC (rev 29727)
+++ gnunet/src/include/block_regex.h 2013-09-30 21:44:15 UTC (rev 29728)
@@ -67,7 +67,7 @@
/**
* Public key of the peer signing.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey public_key;
+ struct GNUNET_PeerIdentity peer;
/**
* The signature.
Modified: gnunet/src/regex/plugin_block_regex.c
===================================================================
--- gnunet/src/regex/plugin_block_regex.c 2013-09-30 21:41:59 UTC (rev
29727)
+++ gnunet/src/regex/plugin_block_regex.c 2013-09-30 21:44:15 UTC (rev
29728)
@@ -189,7 +189,7 @@
GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT,
&rba->purpose,
&rba->signature,
- &rba->public_key))
+ &rba->peer.public_key))
{
GNUNET_break_op(0);
return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
Modified: gnunet/src/regex/regex_internal_dht.c
===================================================================
--- gnunet/src/regex/regex_internal_dht.c 2013-09-30 21:41:59 UTC (rev
29727)
+++ gnunet/src/regex/regex_internal_dht.c 2013-09-30 21:44:15 UTC (rev
29728)
@@ -121,7 +121,8 @@
ab.purpose.purpose = ntohl (GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT);
ab.expiration_time = GNUNET_TIME_absolute_hton
(GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_DHT_MAX_EXPIRATION));
ab.key = *key;
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (h->priv, &ab.public_key);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (h->priv,
+ &ab.peer.public_key);
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_ecc_sign (h->priv,
&ab.purpose,
@@ -373,7 +374,6 @@
const struct RegexAcceptBlock *block = data;
struct RegexSearchContext *ctx = cls;
struct REGEX_INTERNAL_Search *info = ctx->info;
- struct GNUNET_PeerIdentity pid;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Regex result accept for %s (key %s)\n",
@@ -385,11 +385,8 @@
GNUNET_STATISTICS_update (info->stats,
"# regex accepting block bytes found",
size, GNUNET_NO);
- GNUNET_CRYPTO_hash (&block->public_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
- &pid.hashPubKey);
info->callback (info->callback_cls,
- &pid,
+ &block->peer,
get_path, get_path_length,
put_path, put_path_length);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29728 - in gnunet/src: include regex,
gnunet <=