1 files changed, 39 insertions, 27 deletions

diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c
index 581e21152..4369367e4 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -45,6 +45,11 @@ TALER_EXCHANGE_free_melt_data_ (struct MeltData *md)
       struct FreshCoinData *fcd = &md->fcds[j];
 
       TALER_denom_pub_free (&fcd->fresh_pk);
+      for (size_t i = 0; i < TALER_CNC_KAPPA; i++)
+      {
+        TALER_age_commitment_proof_free (fcd->age_commitment_proofs[i]);
+        GNUNET_free (fcd->age_commitment_proofs[i]);
+      }
     }
     GNUNET_free (md->fcds);
   }
@@ -63,7 +68,7 @@ TALER_EXCHANGE_get_melt_data_ (
 {
   struct TALER_Amount total;
   struct TALER_CoinSpendPublicKeyP coin_pub;
-  struct TALER_CsNonce nonces[rd->fresh_pks_len];
+  union GNUNET_CRYPTO_BlindSessionNonce nonces[rd->fresh_pks_len];
   bool uses_cs = false;
 
   GNUNET_CRYPTO_eddsa_key_get_public (&rd->melt_priv.eddsa_priv,
@@ -84,32 +89,41 @@ TALER_EXCHANGE_get_melt_data_ (
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (rd->melt_amount.currency,
                                         &total));
-  TALER_denom_pub_deep_copy (&md->melted_coin.pub_key,
-                             &rd->melt_pk.key);
-  TALER_denom_sig_deep_copy (&md->melted_coin.sig,
-                             &rd->melt_sig);
+  TALER_denom_pub_copy (&md->melted_coin.pub_key,
+                        &rd->melt_pk.key);
+  TALER_denom_sig_copy (&md->melted_coin.sig,
+                        &rd->melt_sig);
   md->fcds = GNUNET_new_array (md->num_fresh_coins,
                                struct FreshCoinData);
   for (unsigned int j = 0; j<rd->fresh_pks_len; j++)
   {
     struct FreshCoinData *fcd = &md->fcds[j];
 
-    if (alg_values[j].cipher != rd->fresh_pks[j].key.cipher)
+    TALER_denom_pub_copy (&fcd->fresh_pk,
+                          &rd->fresh_pks[j].key);
+    GNUNET_assert (NULL != fcd->fresh_pk.bsign_pub_key);
+    if (alg_values[j].blinding_inputs->cipher !=
+        fcd->fresh_pk.bsign_pub_key->cipher)
     {
       GNUNET_break (0);
       TALER_EXCHANGE_free_melt_data_ (md);
       return GNUNET_SYSERR;
     }
-    if (TALER_DENOMINATION_CS == alg_values[j].cipher)
+    switch (fcd->fresh_pk.bsign_pub_key->cipher)
     {
+    case GNUNET_CRYPTO_BSA_INVALID:
+      GNUNET_break (0);
+      TALER_EXCHANGE_free_melt_data_ (md);
+      return GNUNET_SYSERR;
+    case GNUNET_CRYPTO_BSA_RSA:
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
       uses_cs = true;
-      TALER_cs_refresh_nonce_derive (
-        rms,
-        j,
-        &nonces[j]);
+      TALER_cs_refresh_nonce_derive (rms,
+                                     j,
+                                     &nonces[j].cs_nonce);
+      break;
     }
-    TALER_denom_pub_deep_copy (&fcd->fresh_pk,
-                               &rd->fresh_pks[j].key);
     if ( (0 >
           TALER_amount_add (&total,
                             &total,
@@ -165,10 +179,11 @@ TALER_EXCHANGE_get_melt_data_ (
       struct TALER_CoinSpendPrivateKeyP *coin_priv = &fcd->coin_priv;
       struct TALER_PlanchetMasterSecretP *ps = &fcd->ps[i];
       struct TALER_RefreshCoinData *rcd = &md->rcd[i][j];
-      union TALER_DenominationBlindingKeyP *bks = &fcd->bks[i];
+      union GNUNET_CRYPTO_BlindingSecretP *bks = &fcd->bks[i];
       struct TALER_PlanchetDetail pd;
       struct TALER_CoinPubHashP c_hash;
-      struct TALER_AgeCommitmentHash *ach = NULL;
+      struct TALER_AgeCommitmentHash ach;
+      struct TALER_AgeCommitmentHash *pah = NULL;
 
       TALER_transfer_secret_to_planchet_secret (&trans_sec,
                                                 j,
@@ -182,33 +197,30 @@ TALER_EXCHANGE_get_melt_data_ (
                                              &alg_values[j],
                                              bks);
 
-      /* Handle age commitment, if present */
-      if (NULL != md->melted_coin.age_commitment_proof)
+      if (NULL != rd->melt_age_commitment_proof)
       {
-        fcd->age_commitment_proof[i] = GNUNET_new (struct
-                                                   TALER_AgeCommitmentProof);
-        ach = GNUNET_new (struct TALER_AgeCommitmentHash);
+        fcd->age_commitment_proofs[i] = GNUNET_new (struct
+                                                    TALER_AgeCommitmentProof);
 
         GNUNET_assert (GNUNET_OK ==
                        TALER_age_commitment_derive (
                          md->melted_coin.age_commitment_proof,
                          &trans_sec.key,
-                         fcd->age_commitment_proof[i]));
+                         fcd->age_commitment_proofs[i]));
 
         TALER_age_commitment_hash (
-          &fcd->age_commitment_proof[i]->commitment,
-          ach);
+          &fcd->age_commitment_proofs[i]->commitment,
+          &ach);
+        pah = &ach;
       }
 
-      if (TALER_DENOMINATION_CS == alg_values[j].cipher)
-        pd.blinded_planchet.details.cs_blinded_planchet.nonce = nonces[j];
-
       if (GNUNET_OK !=
           TALER_planchet_prepare (&fcd->fresh_pk,
                                   &alg_values[j],
                                   bks,
+                                  &nonces[j],
                                   coin_priv,
-                                  ach,
+                                  pah,
                                   &c_hash,
                                   &pd))
       {