taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix type of transfer keys

Browse Source
This commit is contained in:
Christian Grothoff 2015-04-10 22:18:50 +02:00
parent d04360879e
commit dd63d2f846
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/taler_crypto_lib.h
View File

@ -101,9 +101,8 @@ struct TALER_TransferPublicKeyP
{ {
/** /**
* Taler uses ECDSA for transfer keys. * Taler uses ECDSA for transfer keys.
* FIXME: should this not be ECDHE?
*/ */
struct GNUNET_CRYPTO_EcdsaPublicKey ecdsa_pub; struct GNUNET_CRYPTO_EcdhePublicKey ecdhe_pub;
}; };
@ -115,9 +114,8 @@ struct TALER_TransferPrivateKeyP
{ {
/** /**
* Taler uses ECDSA for melting session keys. * Taler uses ECDSA for melting session keys.
* FIXME: should this not be ECDHE?
*/ */
struct GNUNET_CRYPTO_EcdsaPrivateKey ecdsa_priv; struct GNUNET_CRYPTO_EcdhePrivateKey ecdhe_priv;
}; };

22
src/mint/taler-mint-httpd_db.c
View File

@ -782,8 +782,6 @@ check_commitment (struct MHD_Connection *connection,
unsigned int j; unsigned int j;
struct TALER_LinkSecretP last_shared_secret; struct TALER_LinkSecretP last_shared_secret;
int secret_initialized = GNUNET_NO; int secret_initialized = GNUNET_NO;
struct GNUNET_CRYPTO_EcdhePublicKey coin_ecdhe;
struct GNUNET_CRYPTO_EcdhePrivateKey transfer_ecdhe;
struct TALER_MINTDB_RefreshCommitLinkP *commit_links; struct TALER_MINTDB_RefreshCommitLinkP *commit_links;
struct TALER_MINTDB_RefreshCommitCoin *commit_coins; struct TALER_MINTDB_RefreshCommitCoin *commit_coins;
@ -809,8 +807,8 @@ check_commitment (struct MHD_Connection *connection,
struct TALER_LinkSecretP shared_secret; struct TALER_LinkSecretP shared_secret;
struct TALER_TransferPublicKeyP transfer_pub_check; struct TALER_TransferPublicKeyP transfer_pub_check;
GNUNET_CRYPTO_ecdsa_key_get_public (&transfer_privs[j].ecdsa_priv, GNUNET_CRYPTO_ecdhe_key_get_public (&transfer_privs[j].ecdhe_priv,
&transfer_pub_check.ecdsa_pub); &transfer_pub_check.ecdhe_pub);
if (0 != if (0 !=
memcmp (&transfer_pub_check, memcmp (&transfer_pub_check,
&commit_links[j].transfer_pub, &commit_links[j].transfer_pub,
@ -822,31 +820,25 @@ check_commitment (struct MHD_Connection *connection,
/* FIXME: return more specific error with original signature (#3712) */ /* FIXME: return more specific error with original signature (#3712) */
return (MHD_YES == return (MHD_YES ==
TMH_RESPONSE_reply_refresh_reveal_missmatch (connection, TMH_RESPONSE_reply_refresh_reveal_missmatch (connection,
off, off,
j, j,
"transfer key")) "transfer key"))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
} }
/* We're converting key types here, which is not very nice /* We're converting key types here, which is not very nice
* but necessary and harmless (keys will be thrown away later). */ * but necessary and harmless (keys will be thrown away later). */
GNUNET_CRYPTO_ecdsa_public_to_ecdhe (&melts[j].coin.coin_pub.ecdsa_pub,
&coin_ecdhe);
GNUNET_CRYPTO_ecdsa_private_to_ecdhe (&transfer_privs[j].ecdsa_priv,
&transfer_ecdhe);
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CRYPTO_ecc_ecdh (&transfer_ecdhe, GNUNET_CRYPTO_ecc_ecdh (&transfer_privs[j].ecdhe_priv,
&coin_ecdhe, &melts[j].coin.coin_pub.ecdhe_pub,
&transfer_secret.key)) &transfer_secret.key))
{ {
GNUNET_break (0); GNUNET_break (0);
GNUNET_CRYPTO_ecdhe_key_clear (&transfer_ecdhe);
GNUNET_free (commit_links); GNUNET_free (commit_links);
return (MHD_YES == TMH_RESPONSE_reply_internal_error (connection, return (MHD_YES == TMH_RESPONSE_reply_internal_error (connection,
"ECDH error")) "ECDH error"))
? GNUNET_NO : GNUNET_SYSERR; ? GNUNET_NO : GNUNET_SYSERR;
} }
GNUNET_CRYPTO_ecdhe_key_clear (&transfer_ecdhe);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_transfer_decrypt (&commit_links[j].shared_secret_enc, TALER_transfer_decrypt (&commit_links[j].shared_secret_enc,
&transfer_secret, &transfer_secret,