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

db: Cache denom key signatures to DB.

Browse Source
This commit is contained in:
Sree Harsha Totakura 2015-03-09 15:35:35 +01:00
parent 8eaeda9958
commit 1841c0e703
2 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/mint/mint_db.c
View File

@ -180,6 +180,7 @@ TALER_MINT_DB_create_tables (int temporary)
"(" "("
"blind_ev BYTEA PRIMARY KEY" "blind_ev BYTEA PRIMARY KEY"
",denom_pub BYTEA NOT NULL" /* FIXME: Make this a foreign key? */ ",denom_pub BYTEA NOT NULL" /* FIXME: Make this a foreign key? */
",denom_sig BYTEA NOT NULL"
",reserve_pub BYTEA REFERENCES reserves (reserve_pub) ON DELETE CASCADE" ",reserve_pub BYTEA REFERENCES reserves (reserve_pub) ON DELETE CASCADE"
",reserve_sig BYTEA NOT NULL" ",reserve_sig BYTEA NOT NULL"
");"); ");");
@ -328,15 +329,17 @@ TALER_MINT_DB_prepare (PGconn *db_conn)
" expiration_date) VALUES (" " expiration_date) VALUES ("
" $1, $2, $3, $4);", " $1, $2, $3, $4);",
4, NULL); 4, NULL);
PREPARE ("insert_collectable_blindcoins", PREPARE ("insert_collectable_blindcoin",
"INSERT INTO collectable_blindcoins ( " "INSERT INTO collectable_blindcoins ( "
" blind_ev" " blind_ev"
",denom_pub, reserve_pub, reserve_sig) " ",denom_pub, denom_sig"
"VALUES ($1, $2, $3, $4)", ",reserve_pub, reserve_sig) "
4, NULL); "VALUES ($1, $2, $3, $4, $5)",
PREPARE ("get_collectable_blindcoins", 5, NULL);
PREPARE ("get_collectable_blindcoin",
"SELECT " "SELECT "
"denom_pub, reserve_sig, reserve_pub " " denom_pub, denom_sig"
",reserve_sig, reserve_pub "
"FROM collectable_blindcoins " "FROM collectable_blindcoins "
"WHERE blind_ev = $1", "WHERE blind_ev = $1",
1, NULL); 1, NULL);
@ -932,15 +935,19 @@ TALER_MINT_DB_get_collectable_blindcoin (PGconn *db_conn,
TALER_DB_QUERY_PARAM_END TALER_DB_QUERY_PARAM_END
}; };
struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub; struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub;
struct GNUNET_CRYPTO_rsa_Signature *denom_sig;
char *denom_pub_enc; char *denom_pub_enc;
char *denom_sig_enc;
size_t denom_pub_enc_size; size_t denom_pub_enc_size;
size_t denom_sig_enc_size;
int ret; int ret;
ret = GNUNET_SYSERR; ret = GNUNET_SYSERR;
denom_pub = NULL; denom_pub = NULL;
denom_pub_enc = NULL; denom_pub_enc = NULL;
denom_sig_enc = NULL;
result = TALER_DB_exec_prepared (db_conn, result = TALER_DB_exec_prepared (db_conn,
"get_collectable_blindcoins", "get_collectable_blindcoin",
params); params);
if (PGRES_TUPLES_OK != PQresultStatus (result)) if (PGRES_TUPLES_OK != PQresultStatus (result))
@ -955,6 +962,7 @@ TALER_MINT_DB_get_collectable_blindcoin (PGconn *db_conn,
} }
struct TALER_DB_ResultSpec rs[] = { struct TALER_DB_ResultSpec rs[] = {
TALER_DB_RESULT_SPEC_VAR("denom_pub", &denom_pub_enc, &denom_pub_enc_size), TALER_DB_RESULT_SPEC_VAR("denom_pub", &denom_pub_enc, &denom_pub_enc_size),
TALER_DB_RESULT_SPEC_VAR("denom_sig", &denom_sig_enc, &denom_sig_enc_size),
TALER_DB_RESULT_SPEC("reserve_sig", &collectable->reserve_sig), TALER_DB_RESULT_SPEC("reserve_sig", &collectable->reserve_sig),
TALER_DB_RESULT_SPEC("reserve_pub", &collectable->reserve_pub), TALER_DB_RESULT_SPEC("reserve_pub", &collectable->reserve_pub),
TALER_DB_RESULT_SPEC_END TALER_DB_RESULT_SPEC_END
@ -967,19 +975,27 @@ TALER_MINT_DB_get_collectable_blindcoin (PGconn *db_conn,
} }
denom_pub = GNUNET_CRYPTO_rsa_public_key_decode (denom_pub_enc, denom_pub = GNUNET_CRYPTO_rsa_public_key_decode (denom_pub_enc,
denom_pub_enc_size); denom_pub_enc_size);
if (NULL == denom_pub) denom_sig = GNUNET_CRYPTO_rsa_signature_decode (denom_sig_enc,
denom_sig_enc_size);
if ((NULL == denom_pub) || (NULL == denom_sig))
{ {
GNUNET_break (0); GNUNET_break (0);
goto cleanup; goto cleanup;
} }
collectable->denom_pub = denom_pub; collectable->denom_pub = denom_pub;
collectable->sig = denom_sig;
ret = GNUNET_YES; ret = GNUNET_YES;
cleanup: cleanup:
PQclear (result); PQclear (result);
GNUNET_free_non_null (denom_pub_enc); GNUNET_free_non_null (denom_pub_enc);
if ((GNUNET_YES != ret) && (NULL != denom_pub)) GNUNET_free_non_null (denom_sig_enc);
GNUNET_CRYPTO_rsa_public_key_free (denom_pub); if (GNUNET_YES != ret)
{ if (NULL != denom_pub)
GNUNET_CRYPTO_rsa_public_key_free (denom_pub);
if (NULL != denom_sig)
GNUNET_CRYPTO_rsa_signature_free (denom_sig);
}
return ret; return ret;
} }
@ -1003,25 +1019,31 @@ TALER_MINT_DB_insert_collectable_blindcoin (PGconn *db_conn,
{ {
PGresult *result; PGresult *result;
char *denom_pub_enc = NULL; char *denom_pub_enc = NULL;
char *denom_sig_enc = NULL;
size_t denom_pub_enc_size; size_t denom_pub_enc_size;
size_t denom_sig_enc_size;
int ret;
ret = GNUNET_SYSERR;
denom_pub_enc_size = denom_pub_enc_size =
GNUNET_CRYPTO_rsa_public_key_encode (collectable->denom_pub, GNUNET_CRYPTO_rsa_public_key_encode (collectable->denom_pub,
&denom_pub_enc); &denom_pub_enc);
denom_sig_enc_size =
GNUNET_CRYPTO_rsa_signature_encode (collectable->sig, &denom_sig_enc);
struct TALER_DB_QueryParam params[] = { struct TALER_DB_QueryParam params[] = {
TALER_DB_QUERY_PARAM_PTR (h_blind), TALER_DB_QUERY_PARAM_PTR (h_blind),
TALER_DB_QUERY_PARAM_PTR_SIZED (denom_pub_enc, denom_pub_enc_size - 1), /* DB doesn't like the trailing \0 */ TALER_DB_QUERY_PARAM_PTR_SIZED (denom_pub_enc, denom_pub_enc_size - 1),
TALER_DB_QUERY_PARAM_PTR_SIZED (denom_sig_enc, denom_sig_enc_size - 1), /* DB doesn't like the trailing \0 */
TALER_DB_QUERY_PARAM_PTR (&collectable->reserve_pub), TALER_DB_QUERY_PARAM_PTR (&collectable->reserve_pub),
TALER_DB_QUERY_PARAM_PTR (&collectable->reserve_sig), TALER_DB_QUERY_PARAM_PTR (&collectable->reserve_sig),
TALER_DB_QUERY_PARAM_END TALER_DB_QUERY_PARAM_END
}; };
int ret;
result = TALER_DB_exec_prepared (db_conn, result = TALER_DB_exec_prepared (db_conn,
"insert_collectable_blindcoins", "insert_collectable_blindcoin",
params); params);
if (PGRES_COMMAND_OK != PQresultStatus (result)) if (PGRES_COMMAND_OK != PQresultStatus (result))
{ {
ret = GNUNET_SYSERR; QUERY_ERR (result);
goto cleanup; goto cleanup;
} }
ret = GNUNET_OK; ret = GNUNET_OK;
@ -1029,6 +1051,7 @@ TALER_MINT_DB_insert_collectable_blindcoin (PGconn *db_conn,
cleanup: cleanup:
PQclear (result); PQclear (result);
GNUNET_free_non_null (denom_pub_enc); GNUNET_free_non_null (denom_pub_enc);
GNUNET_free_non_null (denom_sig_enc);
return ret; return ret;
} }
@ -1047,7 +1070,6 @@ TALER_MINT_DB_get_reserve_history (PGconn *db_conn,
{ {
// FIXME: implement logic! // FIXME: implement logic!
PGresult *result; PGresult *result;
// int res;
struct TALER_DB_QueryParam params[] = { struct TALER_DB_QueryParam params[] = {
TALER_DB_QUERY_PARAM_PTR (reserve_pub), TALER_DB_QUERY_PARAM_PTR (reserve_pub),
TALER_DB_QUERY_PARAM_END TALER_DB_QUERY_PARAM_END

14
src/mint/test_mint_db.c
View File

@ -124,6 +124,7 @@ run (void *cls, char *const *args, const char *cfgfile,
db = NULL; db = NULL;
dkp = NULL; dkp = NULL;
ZR_BLK (&cbc);
ZR_BLK (&cbc2); ZR_BLK (&cbc2);
if (GNUNET_OK != TALER_MINT_DB_init ("postgres:///taler")) if (GNUNET_OK != TALER_MINT_DB_init ("postgres:///taler"))
{ {
@ -172,17 +173,18 @@ run (void *cls, char *const *args, const char *cfgfile,
RND_BLK(&h_blind); RND_BLK(&h_blind);
RND_BLK(&cbc.reserve_sig); RND_BLK(&cbc.reserve_sig);
cbc.denom_pub = dkp->pub; cbc.denom_pub = dkp->pub;
cbc.sig = NULL; cbc.sig = GNUNET_CRYPTO_rsa_sign (dkp->priv, &h_blind, sizeof (h_blind));
memcpy (&cbc.reserve_pub, &reserve_pub, sizeof (reserve_pub)); memcpy (&cbc.reserve_pub, &reserve_pub, sizeof (reserve_pub));
FAILIF (GNUNET_OK!= TALER_MINT_DB_insert_collectable_blindcoin (db, FAILIF (GNUNET_OK != TALER_MINT_DB_insert_collectable_blindcoin (db,
&h_blind, &h_blind,
&cbc)); &cbc));
FAILIF (GNUNET_YES != TALER_MINT_DB_get_collectable_blindcoin (db, FAILIF (GNUNET_YES != TALER_MINT_DB_get_collectable_blindcoin (db,
&h_blind, &h_blind,
&cbc2)); &cbc2));
FAILIF (NULL == cbc2.denom_pub); FAILIF (NULL == cbc2.denom_pub);
FAILIF (0 != memcmp (&cbc2.reserve_sig, &cbc.reserve_sig, sizeof (cbc2.reserve_sig))); FAILIF (0 != memcmp (&cbc2.reserve_sig, &cbc.reserve_sig, sizeof (cbc2.reserve_sig)));
FAILIF (0 != memcmp (&cbc2.reserve_pub, &cbc.reserve_pub, sizeof (cbc2.reserve_pub))); FAILIF (0 != memcmp (&cbc2.reserve_pub, &cbc.reserve_pub, sizeof (cbc2.reserve_pub)));
FAILIF (GNUNET_OK != GNUNET_CRYPTO_rsa_verify (&h_blind, cbc2.sig, dkp->pub));
result = 0; result = 0;
drop: drop:
@ -190,8 +192,12 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_break (GNUNET_OK == TALER_MINT_DB_drop_temporary (db)); GNUNET_break (GNUNET_OK == TALER_MINT_DB_drop_temporary (db));
if (NULL != dkp) if (NULL != dkp)
destroy_denon_key_pair (dkp); destroy_denon_key_pair (dkp);
if (NULL != cbc.sig)
GNUNET_CRYPTO_rsa_signature_free (cbc.sig);
if (NULL != cbc2.denom_pub) if (NULL != cbc2.denom_pub)
GNUNET_CRYPTO_rsa_public_key_free (cbc2.denom_pub); GNUNET_CRYPTO_rsa_public_key_free (cbc2.denom_pub);
if (NULL != cbc2.sig)
GNUNET_CRYPTO_rsa_signature_free (cbc2.sig);
dkp = NULL; dkp = NULL;
} }