-dce

src/util/crypto.c

@@ -413,8 +413,8 @@ TALER_planchet_to_coin (
 {
   struct TALER_DenominationSignature sig;
 
-  if (dk->cipher != blind_sig->cipher
+  if ( (dk->cipher != blind_sig->cipher) ||
-      && dk->cipher != alg_values->cipher)
+       (dk->cipher != alg_values->cipher) )
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -435,22 +435,6 @@ TALER_planchet_to_coin (
     break;
   case TALER_DENOMINATION_CS:
     {
-      struct GNUNET_CRYPTO_CsC c[2];
-      struct GNUNET_CRYPTO_CsBlindingSecret bs[2];
-      struct TALER_DenominationCSPublicRPairP r_pub_blind;
-
-      GNUNET_CRYPTO_cs_blinding_secrets_derive (&bks->nonce,
-                                                bs);
-      GNUNET_CRYPTO_cs_calc_blinded_c (
-        bs,
-        alg_values->details.cs_values.r_pub_pair.r_pub,
-        &dk->details.cs_public_key,
-        &c_hash->hash,
-        sizeof(struct GNUNET_HashCode),
-        c,
-        r_pub_blind.r_pub);
-      sig.details.cs_signature.r_point
-        = r_pub_blind.r_pub[blind_sig->details.blinded_cs_answer.b];
       if (GNUNET_OK !=
           TALER_denom_sig_unblind (&sig,
                                    blind_sig,