1 files changed, 5 insertions, 435 deletions

diff --git a/src/service/revocation/revocation_api.c b/src/service/revocation/revocation_api.c
index 3b7d83710..0e3641af8 100644
--- a/src/service/revocation/revocation_api.c
+++ b/src/service/revocation/revocation_api.c
@@ -52,60 +52,6 @@ struct GNUNET_REVOCATION_Query
 
 
 /**
- * Helper struct that holds a found pow nonce
- * and the corresponding number of leading zeros.
- */
-struct BestPow
-{
-  /**
-   * PoW nonce
-   */
-  uint64_t pow;
-
-  /**
-   * Corresponding zero bits in hash
-   */
-  unsigned int bits;
-};
-
-
-/**
- * The handle to a PoW calculation.
- * Used in iterative PoW rounds.
- */
-struct GNUNET_REVOCATION_PowCalculationHandle
-{
-  /**
-   * Current set of found PoWs
-   */
-  struct BestPow best[POW_COUNT];
-
-  /**
-   * The final PoW result data structure.
-   */
-  struct GNUNET_REVOCATION_PowP *pow;
-
-  /**
-   * The current nonce to try
-   */
-  uint64_t current_pow;
-
-  /**
-   * Epochs how long the PoW should be valid.
-   * This is added on top of the difficulty in the PoW.
-   */
-  unsigned int epochs;
-
-  /**
-   * The difficulty (leading zeros) to achieve.
-   */
-  unsigned int difficulty;
-
-};
-
-static struct GNUNET_CRYPTO_PowSalt salt = { "GnsRevocationPow" };
-
-/**
  * Generic error handler, called with the appropriate
  * error code and the same closure specified at the creation of
  * the message queue.
@@ -301,7 +247,7 @@ handle_revocation_response (void *cls,
  */
 struct GNUNET_REVOCATION_Handle *
 GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_REVOCATION_PowP *pow,
+                          const struct GNUNET_GNSRECORD_PowP *pow,
                           GNUNET_REVOCATION_Callback func,
                           void *func_cls)
 {
@@ -339,9 +285,9 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_free (h);
     return NULL;
   }
-  if (GNUNET_YES != GNUNET_REVOCATION_check_pow (pow,
-                                                 (unsigned int) matching_bits,
-                                                 epoch_duration))
+  if (GNUNET_YES != GNUNET_GNSRECORD_check_pow (pow,
+                                                (unsigned int) matching_bits,
+                                                epoch_duration))
   {
     GNUNET_break (0);
     GNUNET_free (h);
@@ -361,7 +307,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   h->func = func;
   h->func_cls = func_cls;
-  size_t extra_len = GNUNET_REVOCATION_proof_get_size (pow);
+  size_t extra_len = GNUNET_GNSRECORD_proof_get_size (pow);
   env = GNUNET_MQ_msg_extra (rm,
                              extra_len,
                              GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE);
@@ -385,380 +331,4 @@ GNUNET_REVOCATION_revoke_cancel (struct GNUNET_REVOCATION_Handle *h)
 }
 
 
-/**
- * Calculate the average zeros in the pows.
- *
- * @param ph the PowHandle
- * @return the average number of zeros.
- */
-static unsigned int
-calculate_score (const struct GNUNET_REVOCATION_PowCalculationHandle *ph)
-{
-  double sum = 0.0;
-  for (unsigned int j = 0; j<POW_COUNT; j++)
-    sum += ph->best[j].bits;
-  double avg = sum / POW_COUNT;
-  return avg;
-}
-
-
-struct GNUNET_REVOCATION_SignaturePurposePS *
-REV_create_signature_message (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_REVOCATION_SignaturePurposePS *spurp;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  size_t ksize;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  spurp = GNUNET_malloc (sizeof (*spurp) + ksize);
-  spurp->timestamp = pow->timestamp;
-  spurp->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION);
-  spurp->purpose.size = htonl (sizeof(*spurp) + ksize);
-  GNUNET_CRYPTO_write_public_key_to_buffer (pk,
-                                              (char*) &spurp[1],
-                                              ksize);
-  return spurp;
-}
-
-
-enum GNUNET_GenericReturnValue
-check_signature_identity (const struct GNUNET_REVOCATION_PowP *pow,
-                          const struct GNUNET_CRYPTO_PublicKey *key)
-{
-  struct GNUNET_REVOCATION_SignaturePurposePS *spurp;
-  unsigned char *sig;
-  size_t ksize;
-  int ret;
-
-  ksize = GNUNET_CRYPTO_public_key_get_length (key);
-  spurp = REV_create_signature_message (pow);
-  sig = ((unsigned char*) &pow[1] + ksize);
-  ret =
-    GNUNET_CRYPTO_signature_verify_raw_ (
-      GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION,
-      &spurp->purpose,
-      sig,
-      key);
-  GNUNET_free (spurp);
-  return ret == GNUNET_OK ? GNUNET_OK : GNUNET_SYSERR;
-}
-
-
-enum GNUNET_GenericReturnValue
-check_signature (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  return check_signature_identity (pow, pk);
-}
-
-
-/**
- * Check if the given proof-of-work is valid.
- *
- * @param pow proof of work
- * @param difficulty how many bits must match (configuration) LSD0001: D
- * @param epoch_duration length of single epoch in configuration
- * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_check_pow (const struct GNUNET_REVOCATION_PowP *pow,
-                             unsigned int difficulty,
-                             struct GNUNET_TIME_Relative epoch_duration)
-{
-  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
-           + sizeof (struct GNUNET_TIME_AbsoluteNBO)
-           + sizeof (uint64_t)] GNUNET_ALIGN;
-  struct GNUNET_HashCode result;
-  struct GNUNET_TIME_Absolute ts;
-  struct GNUNET_TIME_Absolute exp;
-  struct GNUNET_TIME_Relative ttl;
-  struct GNUNET_TIME_Relative buffer;
-  /* LSD0001: D' */
-  unsigned int score = 0;
-  unsigned int tmp_score = 0;
-  unsigned int epochs;
-  uint64_t pow_val;
-  ssize_t pklen;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-
-  /**
-   * Check if signature valid
-   */
-  if (GNUNET_OK != check_signature (pow))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Proof of work signature invalid!\n");
-    return GNUNET_SYSERR;
-  }
-
-  /**
-   * First, check if PoW set is strictly monotically increasing
-   */
-  for (unsigned int i = 0; i < POW_COUNT - 1; i++)
-  {
-    if (GNUNET_ntohll (pow->pow[i]) >= GNUNET_ntohll (pow->pow[i + 1]))
-      return GNUNET_NO;
-  }
-  GNUNET_memcpy (&buf[sizeof(uint64_t)],
-                 &pow->timestamp,
-                 sizeof (uint64_t));
-  pklen = GNUNET_CRYPTO_public_key_get_length (pk);
-  if (0 > pklen)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
-                 pk,
-                 pklen);
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-  {
-    pow_val = GNUNET_ntohll (pow->pow[i]);
-    GNUNET_memcpy (buf, &pow->pow[i], sizeof(uint64_t));
-    GNUNET_CRYPTO_pow_hash (&salt,
-                            buf,
-                            sizeof(buf),
-                            &result);
-    tmp_score = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Score %u with %" PRIu64 " (#%u)\n",
-                tmp_score, pow_val, i);
-
-    score += tmp_score;
-
-  }
-  score = score / POW_COUNT;
-  if (score < difficulty)
-    return GNUNET_NO;
-  /* LSD0001: (D'-D+1) */
-  epochs = score - difficulty + 1;
-
-  /**
-   * Check expiration
-   */
-  ts = GNUNET_TIME_absolute_ntoh (pow->timestamp);
-  ttl = GNUNET_TIME_relative_multiply (epoch_duration,
-                                       epochs);
-  /**
-   * Extend by 10% for unsynchronized clocks
-   */
-  buffer = GNUNET_TIME_relative_divide (epoch_duration,
-                                        10);
-  exp = GNUNET_TIME_absolute_add (ts, ttl);
-  exp = GNUNET_TIME_absolute_add (exp,
-                                  buffer);
-
-  if (0 != GNUNET_TIME_absolute_get_remaining (ts).rel_value_us)
-    return GNUNET_NO; /* Not yet valid. */
-  /* Revert to actual start time */
-  ts = GNUNET_TIME_absolute_add (ts,
-                                 buffer);
-
-  if (0 == GNUNET_TIME_absolute_get_remaining (exp).rel_value_us)
-    return GNUNET_NO; /* expired */
-  return GNUNET_YES;
-}
-
-
-enum GNUNET_GenericReturnValue
-sign_pow_identity (const struct GNUNET_CRYPTO_PrivateKey *key,
-                   struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_TIME_Absolute ts = GNUNET_TIME_absolute_get ();
-  struct GNUNET_REVOCATION_SignaturePurposePS *rp;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  size_t ksize;
-  char *sig;
-
-  /**
-   * Predate the validity period to prevent rejections due to
-   * unsynchronized clocks
-   */
-  ts = GNUNET_TIME_absolute_subtract (ts,
-                                      GNUNET_TIME_UNIT_WEEKS);
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  pow->timestamp = GNUNET_TIME_absolute_hton (ts);
-  rp = REV_create_signature_message (pow);
-  sig = ((char*) &pow[1]) + ksize;
-  int result = GNUNET_CRYPTO_sign_raw_ (key,
-                                          &rp->purpose,
-                                          (void*) sig);
-  GNUNET_free (rp);
-  if (result == GNUNET_SYSERR)
-    return GNUNET_NO;
-  else
-    return result;
-}
-
-
-enum GNUNET_GenericReturnValue
-sign_pow (const struct GNUNET_CRYPTO_PrivateKey *key,
-          struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  GNUNET_CRYPTO_key_get_public (key, pk);
-  return sign_pow_identity (key, pow);
-}
-
-
-/**
- * Initializes a fresh PoW computation.
- *
- * @param key the key to calculate the PoW for.
- * @param[out] pow starting point for PoW calculation (not yet valid)
- */
-void
-GNUNET_REVOCATION_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
-                            struct GNUNET_REVOCATION_PowP *pow)
-{
-  GNUNET_assert (GNUNET_OK == sign_pow (key, pow));
-}
-
-
-struct GNUNET_REVOCATION_PowCalculationHandle*
-GNUNET_REVOCATION_pow_start (struct GNUNET_REVOCATION_PowP *pow,
-                             int epochs,
-                             unsigned int difficulty)
-{
-  struct GNUNET_REVOCATION_PowCalculationHandle *pc;
-  struct GNUNET_TIME_Relative ttl;
-
-
-  pc = GNUNET_new (struct GNUNET_REVOCATION_PowCalculationHandle);
-  pc->pow = pow;
-  ttl = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS,
-                                       epochs);
-  pc->pow->ttl = GNUNET_TIME_relative_hton (ttl);
-  pc->current_pow = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                              UINT64_MAX);
-  pc->difficulty = difficulty;
-  pc->epochs = epochs;
-  return pc;
-}
-
-
-/**
- * Comparison function for quicksort
- *
- * @param a left element
- * @param b right element
- * @return a-b
- */
-static int
-cmp_pow_value (const void *a, const void *b)
-{
-  return (GNUNET_ntohll (*(uint64_t*) a) - GNUNET_ntohll (*(uint64_t*) b));
-}
-
-
-/**
- * Calculate a key revocation valid for broadcasting for a number
- * of epochs.
- *
- * @param pc handle to the PoW, initially called with NULL.
- * @param epochs number of epochs for which the revocation must be valid.
- * @param pow current pow value to try
- * @param difficulty current base difficulty to achieve
- * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_pow_round (struct GNUNET_REVOCATION_PowCalculationHandle *pc)
-{
-  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
-           + sizeof (uint64_t)
-           + sizeof (uint64_t)] GNUNET_ALIGN;
-  struct GNUNET_HashCode result;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  unsigned int zeros;
-  int ret;
-  uint64_t pow_nbo;
-  ssize_t ksize;
-
-  pc->current_pow++;
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &(pc->pow[1]);
-
-  /**
-   * Do not try duplicates
-   */
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-    if (pc->current_pow == pc->best[i].pow)
-      return GNUNET_NO;
-  pow_nbo = GNUNET_htonll (pc->current_pow);
-  GNUNET_memcpy (buf, &pow_nbo, sizeof(uint64_t));
-  GNUNET_memcpy (&buf[sizeof(uint64_t)],
-                 &pc->pow->timestamp,
-                 sizeof (uint64_t));
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  GNUNET_assert (0 < ksize);
-  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
-                 pk,
-                 ksize);
-  GNUNET_CRYPTO_pow_hash (&salt,
-                          buf,
-                          sizeof(buf),
-                          &result);
-  zeros = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-  {
-    if (pc->best[i].bits < zeros)
-    {
-      pc->best[i].bits = zeros;
-      pc->best[i].pow = pc->current_pow;
-      pc->pow->pow[i] = pow_nbo;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "New best score %u with %" PRIu64 " (#%u)\n",
-                  zeros, pc->current_pow, i);
-
-      break;
-    }
-  }
-  ret = calculate_score (pc) >= pc->difficulty + pc->epochs ? GNUNET_YES :
-        GNUNET_NO;
-  if (GNUNET_YES == ret)
-  {
-    /* Sort POWs) */
-    qsort (pc->pow->pow, POW_COUNT, sizeof (uint64_t), &cmp_pow_value);
-  }
-  return ret;
-}
-
-
-/**
- * Stop a PoW calculation
- *
- * @param pc the calculation to clean up
- * @return #GNUNET_YES if pow valid, #GNUNET_NO if pow was set but is not
- * valid
- */
-void
-GNUNET_REVOCATION_pow_stop (struct GNUNET_REVOCATION_PowCalculationHandle *pc)
-{
-  GNUNET_free (pc);
-}
-
-
-size_t
-GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  size_t size;
-  size_t ksize;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  size = sizeof (struct GNUNET_REVOCATION_PowP);
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  size += ksize;
-  size += GNUNET_CRYPTO_signature_get_raw_length_by_type (pk->type);
-  return size;
-}
-
-
 /* end of revocation_api.c */