intermediary commit, breaking the build by starting to move towards variable-size GNUnet signatures instead of fixed-size signatures; much broken now

1 files changed, 12 insertions, 14 deletions

diff --git a/src/mint/test_mint_common.c b/src/mint/test_mint_common.c
index d4bbb6c4..7946f4f1 100644
--- a/src/mint/test_mint_common.c
+++ b/src/mint/test_mint_common.c
@@ -22,7 +22,6 @@
 
 #include "platform.h"
 #include "gnunet/gnunet_util_lib.h"
-#include "taler_rsa.h"
 #include "mint.h"
 
 #define EXITIF(cond)                                              \
@@ -34,9 +33,11 @@ int
 main (int argc, const char *const argv[])
 {
   struct TALER_MINT_DenomKeyIssuePriv dki;
-  struct TALER_RSA_PrivateKeyBinaryEncoded *enc;
+  char *enc;
+  size_t enc_size;
   struct TALER_MINT_DenomKeyIssuePriv dki_read;
-  struct TALER_RSA_PrivateKeyBinaryEncoded *enc_read;
+  char *enc_read;
+  size_t enc_read_size;
   char *tmpfile;
 
   int ret;
@@ -51,20 +52,17 @@ main (int argc, const char *const argv[])
                               &dki.issue.signature,
                               sizeof (dki) - offsetof (struct TALER_MINT_DenomKeyIssue,
                                                        signature));
-  dki.denom_priv = TALER_RSA_key_create ();
-  EXITIF (NULL == (enc = TALER_RSA_encode_key (dki.denom_priv)));
+  dki.denom_priv = GNUNET_CRYPTO_rsa_private_key_create ();
+  enc_size = GNUNET_CRYPTO_rsa_private_key_encode (dki.denom_priv, &enc);
   EXITIF (NULL == (tmpfile = GNUNET_DISK_mktemp ("test_mint_common")));
   EXITIF (GNUNET_OK != TALER_MINT_write_denom_key (tmpfile, &dki));
   EXITIF (GNUNET_OK != TALER_MINT_read_denom_key (tmpfile, &dki_read));
-  EXITIF (NULL == (enc_read = TALER_RSA_encode_key (dki_read.denom_priv)));
-  EXITIF (enc->len != enc_read->len);
+  enc_read_size = GNUNET_CRYPTO_rsa_privae_key_encode (dki_read.denom_priv,
+                                                       &enc_read);
+  EXITIF (enc_size != enc_read_size);
   EXITIF (0 != memcmp (enc,
                        enc_read,
-                       ntohs(enc->len)));
-  EXITIF (0 != memcmp (&dki.issue.signature,
-                       &dki_read.issue.signature,
-                       sizeof (dki) - offsetof (struct TALER_MINT_DenomKeyIssue,
-                                                signature)));
+                       enc_size));
   ret = 0;
 
   EXITIF_exit:
@@ -76,8 +74,8 @@ main (int argc, const char *const argv[])
   }
   GNUNET_free_non_null (enc_read);
   if (NULL != dki.denom_priv)
-    TALER_RSA_key_free (dki.denom_priv);
+    GNUNET_CRYPTO_rsa_private_key_free (dki.denom_priv);
   if (NULL != dki_read.denom_priv)
-    TALER_RSA_key_free (dki_read.denom_priv);
+    GNUNET_CRYPOT_rsa_private_key_free (dki_read.denom_priv);
   return ret;
 }