Merge branch 'master' of git+ssh://taler.net/var/git/mint

1 files changed, 96 insertions, 45 deletions

diff --git a/src/mint-lib/mint_api_refresh_link.c b/src/mint-lib/mint_api_refresh_link.c
index f17949af..d4060bd1 100644
--- a/src/mint-lib/mint_api_refresh_link.c
+++ b/src/mint-lib/mint_api_refresh_link.c
@@ -100,9 +100,10 @@ parse_refresh_link_coin (const struct TALER_MINT_RefreshLinkHandle *rlh,
   void *link_enc;
   size_t link_enc_size;
   struct GNUNET_CRYPTO_rsa_Signature *bsig;
+  struct GNUNET_CRYPTO_rsa_PublicKey *rpub;
   struct MAJ_Specification spec[] = {
     MAJ_spec_varsize ("link_enc", &link_enc, &link_enc_size),
-    MAJ_spec_rsa_public_key ("denom_pub", &pub->rsa_public_key),
+    MAJ_spec_rsa_public_key ("denom_pub", &rpub),
     MAJ_spec_rsa_signature ("ev_sig", &bsig),
     MAJ_spec_end
   };
@@ -152,10 +153,11 @@ parse_refresh_link_coin (const struct TALER_MINT_RefreshLinkHandle *rlh,
   sig->rsa_signature
     = GNUNET_CRYPTO_rsa_unblind (bsig,
                                  rld->blinding_key.rsa_blinding_key,
-                                 pub->rsa_public_key);
+                                 rpub);
 
   /* clean up */
   GNUNET_free (rld);
+  pub->rsa_public_key = GNUNET_CRYPTO_rsa_public_key_dup (rpub);
   MAJ_parse_free (spec);
   return GNUNET_OK;
 }
@@ -173,74 +175,123 @@ static int
 parse_refresh_link_ok (struct TALER_MINT_RefreshLinkHandle *rlh,
                        json_t *json)
 {
-  json_t *jsona;
-  struct TALER_TransferPublicKeyP trans_pub;
-  struct TALER_EncryptedLinkSecretP secret_enc;
-  struct MAJ_Specification spec[] = {
-    MAJ_spec_json ("new_coins", &jsona),
-    MAJ_spec_fixed_auto ("trans_pub", &trans_pub),
-    MAJ_spec_fixed_auto ("secret_enc", &secret_enc),
-    MAJ_spec_end
-  };
+  unsigned int session;
   unsigned int num_coins;
   int ret;
 
-  if (GNUNET_OK !=
-      MAJ_parse_json (json,
-                      spec))
+  if (! json_is_array (json))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if (! json_is_array (jsona))
+  num_coins = 0;
+  for (session=0;session<json_array_size (json); session++)
   {
-    GNUNET_break_op (0);
+    json_t *jsona;
+    struct MAJ_Specification spec[] = {
+      MAJ_spec_json ("new_coins", &jsona),
+      MAJ_spec_end
+    };
+
+    if (GNUNET_OK !=
+	MAJ_parse_json (json_array_get (json, 
+					session),
+			spec))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    if (! json_is_array (jsona))
+    {
+      GNUNET_break_op (0);
+      MAJ_parse_free (spec);
+      return GNUNET_SYSERR;
+    }
+
+    /* count all coins over all sessions */
+    num_coins += json_array_size (jsona);
     MAJ_parse_free (spec);
-    return GNUNET_SYSERR;
   }
-
-  /* decode all coins */
-  num_coins = json_array_size (json);
   {
+    unsigned int off_coin;
     unsigned int i;
     struct TALER_CoinSpendPrivateKeyP coin_privs[num_coins];
     struct TALER_DenominationSignature sigs[num_coins];
     struct TALER_DenominationPublicKey pubs[num_coins];
-
-    for (i=0;i<num_coins;i++)
+      
+    off_coin = 0;
+    for (session=0;session<json_array_size (json); session++)
     {
+      json_t *jsona;
+      struct TALER_TransferPublicKeyP trans_pub;
+      struct TALER_EncryptedLinkSecretP secret_enc;
+      struct MAJ_Specification spec[] = {
+	MAJ_spec_json ("new_coins", &jsona),
+	MAJ_spec_fixed_auto ("transfer_pub", &trans_pub),
+	MAJ_spec_fixed_auto ("secret_enc", &secret_enc),
+	MAJ_spec_end
+      };
+
       if (GNUNET_OK !=
-          parse_refresh_link_coin (rlh,
-                                   json_array_get (json, i),
-                                   &trans_pub,
-                                   &secret_enc,
-                                   &coin_privs[i],
-                                   &sigs[i],
-                                   &pubs[i]))
+	  MAJ_parse_json (json_array_get (json, 
+					  session),
+			  spec))
       {
-        GNUNET_break_op (0);
-        break;
+	GNUNET_break_op (0);
+	return GNUNET_SYSERR;
       }
+      if (! json_is_array (jsona))
+      {
+	GNUNET_break_op (0);
+	MAJ_parse_free (spec);
+	return GNUNET_SYSERR;
+      }
+      
+      /* decode all coins */
+      for (i=0;i<json_array_size (jsona);i++)
+      {
+	if (GNUNET_OK !=
+	    parse_refresh_link_coin (rlh,
+				     json_array_get (jsona, 
+						     i),
+				     &trans_pub,
+				     &secret_enc,
+				     &coin_privs[i+off_coin],
+				     &sigs[i+off_coin],
+				     &pubs[i+off_coin]))
+	{
+	  GNUNET_break_op (0);
+	  break;
+	}
+      }
+      /* check if we really got all, then invoke callback */
+      if (i != json_array_size (jsona))
+      {
+	GNUNET_break_op (0);
+	ret = GNUNET_SYSERR;
+	MAJ_parse_free (spec);
+	break;
+      }
+      off_coin += json_array_size (jsona);
+      MAJ_parse_free (spec);
     }
-
-    /* check if we really got all, then invoke callback */
-    if (i != num_coins)
-    {
-      GNUNET_break_op (0);
-      ret = GNUNET_SYSERR;
-    }
-    else
+    if (off_coin == num_coins)
     {
       rlh->link_cb (rlh->link_cb_cls,
-                    MHD_HTTP_OK,
-                    num_coins,
-                    coin_privs,
-                    sigs,
-                    pubs,
-                    json);
+		    MHD_HTTP_OK,
+		    num_coins,
+		    coin_privs,
+		    sigs,
+		    pubs,
+		    json);
       rlh->link_cb = NULL;
       ret = GNUNET_OK;
     }
+    else
+    {
+      GNUNET_break_op (0);
+      ret = GNUNET_SYSERR;
+    }
 
     /* clean up */
     for (i=0;i<num_coins;i++)