introduce TALER_wallet_deposit_verify

1 files changed, 19 insertions, 74 deletions

diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 8abb73518..188c17f18 100644
--- a/src/lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -431,39 +431,26 @@ verify_signatures (const struct TALER_EXCHANGE_DenomPublicKey *dki,
                    struct GNUNET_TIME_Absolute refund_deadline,
                    const struct TALER_CoinSpendSignatureP *coin_sig)
 {
+  if (GNUNET_OK !=
+      TALER_wallet_deposit_verify (amount,
+                                   &dki->fee_deposit,
+                                   h_wire,
+                                   h_contract_terms,
+                                   NULL /* FIXME: h_extensions! */,
+                                   denom_pub_hash,
+                                   timestamp,
+                                   merchant_pub,
+                                   refund_deadline,
+                                   coin_pub,
+                                   coin_sig))
   {
-    struct TALER_DepositRequestPS dr = {
-      .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_DEPOSIT),
-      .purpose.size = htonl (sizeof (dr)),
-      .h_contract_terms = *h_contract_terms,
-      .h_wire = *h_wire,
-      .h_denom_pub = *denom_pub_hash,
-      .wallet_timestamp = GNUNET_TIME_absolute_hton (timestamp),
-      .refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline),
-      .merchant = *merchant_pub,
-      .coin_pub = *coin_pub
-    };
-
-    TALER_amount_hton (&dr.amount_with_fee,
-                       amount);
-    TALER_amount_hton (&dr.deposit_fee,
-                       &dki->fee_deposit);
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_WALLET_COIN_DEPOSIT,
-                                    &dr,
-                                    &coin_sig->eddsa_signature,
-                                    &coin_pub->eddsa_pub))
-    {
-      GNUNET_break_op (0);
-      TALER_LOG_WARNING ("Invalid coin signature on /deposit request!\n");
-      {
-        TALER_LOG_DEBUG ("... amount_with_fee was %s\n",
-                         TALER_amount2s (amount));
-        TALER_LOG_DEBUG ("... deposit_fee was %s\n",
-                         TALER_amount2s (&dki->fee_deposit));
-      }
-      return GNUNET_SYSERR;
-    }
+    GNUNET_break_op (0);
+    TALER_LOG_WARNING ("Invalid coin signature on /deposit request!\n");
+    TALER_LOG_DEBUG ("... amount_with_fee was %s\n",
+                     TALER_amount2s (amount));
+    TALER_LOG_DEBUG ("... deposit_fee was %s\n",
+                     TALER_amount2s (&dki->fee_deposit));
+    return GNUNET_SYSERR;
   }
 
   /* check coin signature */
@@ -496,48 +483,6 @@ verify_signatures (const struct TALER_EXCHANGE_DenomPublicKey *dki,
 }
 
 
-void
-TALER_EXCHANGE_deposit_permission_sign (
-  const struct TALER_Amount *amount,
-  const struct TALER_Amount *deposit_fee,
-  const struct TALER_MerchantWireHash *h_wire,
-  const struct TALER_PrivateContractHash *h_contract_terms,
-  const struct TALER_ExtensionContractHash *h_extensions,
-  const struct TALER_DenominationHash *h_denom_pub,
-  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
-  struct GNUNET_TIME_Absolute wallet_timestamp,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  struct GNUNET_TIME_Absolute refund_deadline,
-  struct TALER_CoinSpendSignatureP *coin_sig)
-{
-  struct TALER_DepositRequestPS dr = {
-    .purpose.size = htonl (sizeof (dr)),
-    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_DEPOSIT),
-    .h_contract_terms = *h_contract_terms,
-    .h_wire = *h_wire,
-    .h_denom_pub = *h_denom_pub,
-    .wallet_timestamp = GNUNET_TIME_absolute_hton (wallet_timestamp),
-    .refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline),
-    .merchant = *merchant_pub
-  };
-
-  // FIXME: sign also over h_extensions!
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_TIME_round_abs (&wallet_timestamp));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_TIME_round_abs (&refund_deadline));
-  GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
-                                      &dr.coin_pub.eddsa_pub);
-  TALER_amount_hton (&dr.amount_with_fee,
-                     amount);
-  TALER_amount_hton (&dr.deposit_fee,
-                     deposit_fee);
-  GNUNET_CRYPTO_eddsa_sign (&coin_priv->eddsa_priv,
-                            &dr,
-                            &coin_sig->eddsa_signature);
-}
-
-
 struct TALER_EXCHANGE_DepositHandle *
 TALER_EXCHANGE_deposit (
   struct TALER_EXCHANGE_Handle *exchange,