diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-09-19 16:34:27 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-09-19 16:34:27 +0200 |
commit | 37a84c5af7b466bef1d4ca4b18999e8b6ef590f2 (patch) | |
tree | 2b71b3b6f6371decf90065bb744c49f61582882d /src/mint-tools | |
parent | 00b697c405d3d1dfae102eb1223cb07509f680a9 (diff) | |
download | exchange-37a84c5af7b466bef1d4ca4b18999e8b6ef590f2.tar.xz |
finish implementing #3847
Diffstat (limited to 'src/mint-tools')
-rw-r--r-- | src/mint-tools/Makefile.am | 10 | ||||
-rw-r--r-- | src/mint-tools/taler-auditor-sign.c | 82 |
2 files changed, 60 insertions, 32 deletions
diff --git a/src/mint-tools/Makefile.am b/src/mint-tools/Makefile.am index a1b1302de..94b8fb391 100644 --- a/src/mint-tools/Makefile.am +++ b/src/mint-tools/Makefile.am @@ -7,6 +7,7 @@ if USE_COVERAGE endif bin_PROGRAMS = \ + taler-auditor-sign \ taler-mint-keyup \ taler-mint-keycheck \ taler-mint-reservemod \ @@ -15,7 +16,6 @@ bin_PROGRAMS = \ taler_mint_keyup_SOURCES = \ taler-mint-keyup.c - taler_mint_keyup_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ @@ -24,6 +24,14 @@ taler_mint_keyup_LDADD = \ -lgnunetutil $(XLIB) taler_mint_keyup_LDFLAGS = $(POSTGRESQL_LDFLAGS) +taler_auditor_sign_SOURCES = \ + taler-auditor-sign.c +taler_auditor_sign_LDADD = \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/mintdb/libtalermintdb.la \ + -lgnunetutil $(XLIB) + taler_mint_sepa_SOURCES = \ taler-mint-sepa.c diff --git a/src/mint-tools/taler-auditor-sign.c b/src/mint-tools/taler-auditor-sign.c index 8d180790f..bd37e68de 100644 --- a/src/mint-tools/taler-auditor-sign.c +++ b/src/mint-tools/taler-auditor-sign.c @@ -50,11 +50,6 @@ static char *mint_request_file; static char *output_file; /** - * Handle to the auditor's configuration - */ -static struct GNUNET_CONFIGURATION_Handle *kcfg; - -/** * Master public key of the mint. */ static struct TALER_MasterPublicKeyP master_public_key; @@ -101,16 +96,16 @@ print_dk (const struct TALER_DenominationKeyValidityPS *dk) fprintf (stdout, "Validity start time: %s\n", - GNUNET_TIME_absolute_to_string (GNUNET_TIME_absolute_ntoh (dk->start))); + GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->start))); fprintf (stdout, "Withdraw end time: %s\n", - GNUNET_TIME_absolute_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_withdraw))); + GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_withdraw))); fprintf (stdout, "Deposit end time: %s\n", - GNUNET_TIME_absolute_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_spend))); + GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_spend))); fprintf (stdout, "Legal dispute end time: %s\n", - GNUNET_TIME_absolute_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_legal))); + GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_legal))); fprintf (stdout, "\n"); @@ -150,12 +145,12 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv; - struct TALER_AuditorSignatureP sig; + struct TALER_AuditorSignatureP *sigs; struct TALER_AuditorPublicKeyP apub; struct GNUNET_DISK_FileHandle *fh; struct TALER_DenominationKeyValidityPS *dks; unsigned int dks_len; - struct TALER_MintKeyValidityPS *ap; + struct TALER_MintKeyValidityPS kv; off_t in_size; unsigned int i; @@ -187,6 +182,7 @@ main (int argc, { fprintf (stderr, "Mint public key not given\n"); + GNUNET_free (eddsa_priv); return 1; } if (GNUNET_OK != @@ -198,12 +194,14 @@ main (int argc, fprintf (stderr, "Public key `%s' malformed\n", mint_public_key); + GNUNET_free (eddsa_priv); return 1; } if (NULL == mint_request_file) { fprintf (stderr, "Mint signing request not given\n"); + GNUNET_free (eddsa_priv); return 1; } fh = GNUNET_DISK_file_open (mint_request_file, @@ -215,6 +213,7 @@ main (int argc, "Failed to open file `%s': %s\n", mint_request_file, STRERROR (errno)); + GNUNET_free (eddsa_priv); return 1; } if (GNUNET_OK != @@ -226,6 +225,7 @@ main (int argc, mint_request_file, STRERROR (errno)); GNUNET_DISK_file_close (fh); + GNUNET_free (eddsa_priv); return 1; } if (0 != (in_size % sizeof (struct TALER_DenominationKeyValidityPS))) @@ -234,16 +234,17 @@ main (int argc, "Input file size of file `%s' is invalid\n", mint_request_file); GNUNET_DISK_file_close (fh); + GNUNET_free (eddsa_priv); return 1; } dks_len = in_size / sizeof (struct TALER_DenominationKeyValidityPS); - ap = GNUNET_malloc (sizeof (struct TALER_MintKeyValidityPS) + - in_size); - ap.purpose.purpose = htonl (TALER_SIGNATURE_AUDITOR_MINT_KEYS); - ap.purpose.size = htonl (sizeof (struct TALER_MintKeyValidityPS) + - in_size); - ap.master = master_public_key; - dks = (struct TALER_DenominationKeyValidityPS *) &ap[1]; + kv.purpose.purpose = htonl (TALER_SIGNATURE_AUDITOR_MINT_KEYS); + kv.purpose.size = htonl (sizeof (struct TALER_MintKeyValidityPS)); + kv.master = master_public_key; + dks = GNUNET_new_array (dks_len, + struct TALER_DenominationKeyValidityPS); + sigs = GNUNET_new_array (dks_len, + struct TALER_AuditorSignatureP); if (in_size != GNUNET_DISK_file_read (fh, dks, @@ -254,34 +255,51 @@ main (int argc, mint_request_file, STRERROR (errno)); GNUNET_DISK_file_close (fh); - GNUNET_free (ap); + GNUNET_free (sigs); + GNUNET_free (dks); + GNUNET_free (eddsa_priv); return 1; } GNUNET_DISK_file_close (fh); - if (verbose) + for (i=0;i<dks_len;i++) { - for (i=0;i<dks_len;i++) - print_dk (&dks[i]); + struct TALER_DenominationKeyValidityPS *dk = &dks[i]; + + if (verbose) + print_dk (dk); + kv.start = dk->start; + kv.expire_withdraw = dk->expire_withdraw; + kv.expire_spend = dk->expire_spend; + kv.expire_legal = dk->expire_legal; + kv.value = dk->value; + kv.fee_withdraw = dk->fee_withdraw; + kv.fee_deposit = dk->fee_deposit; + kv.fee_refresh = dk->fee_refresh; + kv.denom_hash = dk->denom_hash; + + /* Finally sign ... */ + GNUNET_CRYPTO_eddsa_sign (eddsa_priv, + &kv.purpose, + &sigs[i].eddsa_sig); + + } if (NULL == output_file) { fprintf (stderr, "Output file not given\n"); - GNUNET_free (ap); + GNUNET_free (dks); + GNUNET_free (sigs); + GNUNET_free (eddsa_priv); return 1; } - /* Finally sign ... */ - GNUNET_CRYPTO_eddsa_sign (eddsa_priv, - &ap->purpose, - &sig.eddsa_sig); - /* write result to disk */ if (GNUNET_OK != TALER_MINTDB_auditor_write (output_file, &apub, - &sig, + sigs, &master_public_key, dks_len, dks)) @@ -290,10 +308,12 @@ main (int argc, "Failed to write to file `%s': %s\n", output_file, STRERROR (errno)); - GNUNET_free (ap); + GNUNET_free (sigs); + GNUNET_free (dks); return 1; } - GNUNET_free (ap); + GNUNET_free (sigs); + GNUNET_free (dks); GNUNET_free (eddsa_priv); return 0; } |