Refactoring TALER_AgeCommitment

Instead of a single struct TALER_AgeCommitment, we now use
 1. TALER_AgeCommitment for the age mask and list public keys for age
    restriciton.
 2. TALER_AgeProof for list of private keys for age restriction
 3. TALER_AgeCommitmentProof for the aggregation of the former two.

Also, we introduce TALER_AgeAttestation as the EDDSA signature to attest
a particular age group, along with the function prototypes
TALER_age_commitment_attest and TALER_age_commitment_verify.

1 files changed, 15 insertions, 14 deletions

diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index 9a81a603d..e2ed8b216 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -71,9 +71,10 @@ struct TALER_TESTING_FreshCoinData
   struct TALER_CoinSpendPrivateKeyP coin_priv;
 
   /*
-   * Fresh age commitment for the coin and its hash, NULL if not applicable.
+   * Fresh age commitment for the coin with proof and its hash, NULL if not
+   * applicable.
    */
-  struct TALER_AgeCommitment *age_commitment;
+  struct TALER_AgeCommitmentProof *age_commitment_proof;
   struct TALER_AgeCommitmentHash *h_age_commitment;
 
   /**
@@ -441,7 +442,7 @@ reveal_cb (void *cls,
         return;
       }
       fc->coin_priv = coin->coin_priv;
-      fc->age_commitment = coin->age_commitment;
+      fc->age_commitment_proof = coin->age_commitment_proof;
       fc->h_age_commitment = coin->h_age_commitment;
 
       TALER_denom_sig_deep_copy (&fc->sig,
@@ -834,7 +835,7 @@ refresh_link_run (void *cls,
   /* finally, use private key from withdraw sign command */
   rls->rlh = TALER_EXCHANGE_link (is->exchange,
                                   coin_priv,
-                                  rms->refresh_data.melt_age_commitment,
+                                  rms->refresh_data.melt_age_commitment_proof,
                                   &link_cb,
                                   rls);
 
@@ -1044,7 +1045,7 @@ melt_run (void *cls,
   {
     struct TALER_Amount melt_amount;
     struct TALER_Amount fresh_amount;
-    const struct TALER_AgeCommitment *age_commitment;
+    const struct TALER_AgeCommitmentProof *age_commitment_proof;
     const struct TALER_AgeCommitmentHash *h_age_commitment;
     const struct TALER_DenominationSignature *melt_sig;
     const struct TALER_EXCHANGE_DenomPublicKey *melt_denom_pub;
@@ -1072,9 +1073,9 @@ melt_run (void *cls,
     }
 
     if (GNUNET_OK !=
-        TALER_TESTING_get_trait_age_commitment (coin_command,
-                                                0,
-                                                &age_commitment))
+        TALER_TESTING_get_trait_age_commitment_proof (coin_command,
+                                                      0,
+                                                      &age_commitment_proof))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rms->is);
@@ -1159,13 +1160,13 @@ melt_run (void *cls,
     rms->refresh_data.melt_amount = melt_amount;
     rms->refresh_data.melt_sig = *melt_sig;
     rms->refresh_data.melt_pk = *melt_denom_pub;
-    rms->refresh_data.melt_age_commitment = age_commitment;
+    rms->refresh_data.melt_age_commitment_proof = age_commitment_proof;
     rms->refresh_data.melt_h_age_commitment = h_age_commitment;
     rms->refresh_data.fresh_pks = rms->fresh_pks;
     rms->refresh_data.fresh_pks_len = num_fresh_coins;
 
     GNUNET_assert (age_restricted ==
-                   (NULL != age_commitment));
+                   (NULL != age_commitment_proof));
 
     rms->rmh = TALER_EXCHANGE_melt (is->exchange,
                                     &rms->rms,
@@ -1251,9 +1252,9 @@ melt_traits (void *cls,
                                           &rms->fresh_pks[index]),
       TALER_TESTING_make_trait_coin_priv (index,
                                           rms->melt_priv),
-      TALER_TESTING_make_trait_age_commitment (
+      TALER_TESTING_make_trait_age_commitment_proof (
         index,
-        rms->refresh_data.melt_age_commitment),
+        rms->refresh_data.melt_age_commitment_proof),
       TALER_TESTING_make_trait_h_age_commitment (
         index,
         rms->refresh_data.melt_h_age_commitment),
@@ -1421,9 +1422,9 @@ refresh_reveal_traits (void *cls,
       TALER_TESTING_make_trait_coin_priv (
         index,
         &rrs->fresh_coins[index].coin_priv),
-      TALER_TESTING_make_trait_age_commitment (
+      TALER_TESTING_make_trait_age_commitment_proof (
         index,
-        rrs->fresh_coins[index].age_commitment),
+        rrs->fresh_coins[index].age_commitment_proof),
       TALER_TESTING_make_trait_h_age_commitment (
         index,
         rrs->fresh_coins[index].h_age_commitment),