2 files changed, 41 insertions, 35 deletions

diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 8b4077d0e..7501bee12 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -1136,7 +1136,7 @@ GNUNET_PQ_result_spec_array_string (
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_pub (
   const char *name,
-  struct GNUNET_CRYPTO_BlindSignPublicKey *public_key);
+  struct GNUNET_CRYPTO_BlindSignPublicKey **public_key);
 
 
 /**
@@ -1149,7 +1149,7 @@ GNUNET_PQ_result_spec_blind_sign_pub (
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_priv (
   const char *name,
-  struct GNUNET_CRYPTO_BlindSignPrivateKey *private_key);
+  struct GNUNET_CRYPTO_BlindSignPrivateKey **private_key);
 
 /* ************************* pq.c functions ************************ */
 
diff --git a/src/lib/pq/pq_result_helper.c b/src/lib/pq/pq_result_helper.c
index f8759eba1..cbb1e8e8e 100644
--- a/src/lib/pq/pq_result_helper.c
+++ b/src/lib/pq/pq_result_helper.c
@@ -1816,7 +1816,8 @@ extract_blind_sign_pub (void *cls,
                         size_t *dst_size,
                         void *dst)
 {
-  struct GNUNET_CRYPTO_BlindSignPublicKey *bpk = dst;
+  struct GNUNET_CRYPTO_BlindSignPublicKey **bpk = dst;
+  struct GNUNET_CRYPTO_BlindSignPublicKey *tmp;
   size_t len;
   const char *res;
   int fnum;
@@ -1854,44 +1855,46 @@ extract_blind_sign_pub (void *cls,
                  sizeof (be));
   res += sizeof (be);
   len -= sizeof (be);
-  bpk = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
-  bpk->cipher = ntohl (be);
-  bpk->rc = 1;
-  switch (bpk->cipher)
+  tmp = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+  tmp->cipher = ntohl (be);
+  tmp->rc = 1;
+  switch (tmp->cipher)
   {
   case GNUNET_CRYPTO_BSA_INVALID:
     break;
   case GNUNET_CRYPTO_BSA_RSA:
-    bpk->details.rsa_public_key
+    tmp->details.rsa_public_key
       = GNUNET_CRYPTO_rsa_public_key_decode (res,
                                              len);
-    if (NULL == bpk->details.rsa_public_key)
+    if (NULL == tmp->details.rsa_public_key)
     {
       GNUNET_break (0);
-      GNUNET_free (bpk);
+      GNUNET_free (tmp);
       return GNUNET_SYSERR;
     }
     GNUNET_CRYPTO_hash (res,
                         len,
-                        &bpk->pub_key_hash);
+                        &tmp->pub_key_hash);
+    *bpk = tmp;
     return GNUNET_OK;
   case GNUNET_CRYPTO_BSA_CS:
-    if (sizeof (bpk->details.cs_public_key) != len)
+    if (sizeof (tmp->details.cs_public_key) != len)
     {
       GNUNET_break (0);
-      GNUNET_free (bpk);
+      GNUNET_free (tmp);
       return GNUNET_SYSERR;
     }
-    GNUNET_memcpy (&bpk->details.cs_public_key,
+    GNUNET_memcpy (&tmp->details.cs_public_key,
                    res,
                    len);
     GNUNET_CRYPTO_hash (res,
                         len,
-                        &bpk->pub_key_hash);
+                        &tmp->pub_key_hash);
+    *bpk = tmp;
     return GNUNET_OK;
   }
   GNUNET_break (0);
-  GNUNET_free (bpk);
+  GNUNET_free (tmp);
   return GNUNET_SYSERR;
 }
 
@@ -1907,17 +1910,17 @@ static void
 clean_blind_sign_pub (void *cls,
                       void *rd)
 {
-  struct GNUNET_CRYPTO_BlindSignPublicKey *pub = rd;
+  struct GNUNET_CRYPTO_BlindSignPublicKey **pub = rd;
 
   (void) cls;
-  GNUNET_CRYPTO_blind_sign_pub_decref (pub);
-  pub = NULL;
+  GNUNET_CRYPTO_blind_sign_pub_decref (*pub);
+  *pub = NULL;
 }
 
 
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_pub (const char *name,
-                                     struct GNUNET_CRYPTO_BlindSignPublicKey *pub)
+                                      struct GNUNET_CRYPTO_BlindSignPublicKey **pub)
 {
   struct GNUNET_PQ_ResultSpec res = {
     .conv = &extract_blind_sign_pub,
@@ -1951,7 +1954,8 @@ extract_blind_sign_priv (void *cls,
                          size_t *dst_size,
                          void *dst)
 {
-  struct GNUNET_CRYPTO_BlindSignPrivateKey *bpk = dst;
+  struct GNUNET_CRYPTO_BlindSignPrivateKey **bpk = dst;
+  struct GNUNET_CRYPTO_BlindSignPrivateKey *tmp;
   size_t len;
   const char *res;
   int fnum;
@@ -1989,38 +1993,40 @@ extract_blind_sign_priv (void *cls,
                  sizeof (be));
   res += sizeof (be);
   len -= sizeof (be);
-  bpk = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPrivateKey);
-  bpk->cipher = ntohl (be);
-  bpk->rc = 1;
-  switch (bpk->cipher)
+  tmp = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPrivateKey);
+  tmp->cipher = ntohl (be);
+  tmp->rc = 1;
+  switch (tmp->cipher)
   {
   case GNUNET_CRYPTO_BSA_INVALID:
     break;
   case GNUNET_CRYPTO_BSA_RSA:
-    bpk->details.rsa_private_key
+    tmp->details.rsa_private_key
       = GNUNET_CRYPTO_rsa_private_key_decode (res,
                                               len);
-    if (NULL == bpk->details.rsa_private_key)
+    if (NULL == tmp->details.rsa_private_key)
     {
       GNUNET_break (0);
       GNUNET_free (bpk);
       return GNUNET_SYSERR;
     }
+    *bpk = tmp;
     return GNUNET_OK;
   case GNUNET_CRYPTO_BSA_CS:
-    if (sizeof (bpk->details.cs_private_key) != len)
+    if (sizeof (tmp->details.cs_private_key) != len)
     {
       GNUNET_break (0);
-      GNUNET_free (bpk);
+      GNUNET_free (tmp);
       return GNUNET_SYSERR;
     }
-    GNUNET_memcpy (&bpk->details.cs_private_key,
+    GNUNET_memcpy (&tmp->details.cs_private_key,
                    res,
                    len);
+    *bpk = tmp;
     return GNUNET_OK;
   }
   GNUNET_break (0);
-  GNUNET_free (bpk);
+  GNUNET_free (tmp);
   return GNUNET_SYSERR;
 }
 
@@ -2036,17 +2042,17 @@ static void
 clean_blind_sign_priv (void *cls,
                       void *rd)
 {
-  struct GNUNET_CRYPTO_BlindSignPublicKey *pub = rd;
+  struct GNUNET_CRYPTO_BlindSignPrivateKey **priv = rd;
 
   (void) cls;
-  GNUNET_CRYPTO_blind_sign_pub_decref (pub);
-  pub = NULL;
+  GNUNET_CRYPTO_blind_sign_priv_decref (*priv);
+  *priv = NULL;
 }
 
 
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_priv (const char *name,
-                                       struct GNUNET_CRYPTO_BlindSignPrivateKey *priv)
+                                       struct GNUNET_CRYPTO_BlindSignPrivateKey **priv)
 {
   struct GNUNET_PQ_ResultSpec res = {
     .conv = &extract_blind_sign_priv,