diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-04-15 16:08:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-04-15 16:08:47 +0000 |
commit | 30438ae068cdc7a96eb252ea611f822270db8264 (patch) | |
tree | 00cb4f3d92c6d87664df3c89107e799a9e048aba /src/fs | |
parent | b61bcf75c1e270feb8751320ea70ed3925e0f0cc (diff) | |
download | gnunet-30438ae068cdc7a96eb252ea611f822270db8264.tar.gz gnunet-30438ae068cdc7a96eb252ea611f822270db8264.zip |
-use GCRYMPI_CONST_ONE
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_pseudonym.c | 14 | ||||
-rw-r--r-- | src/fs/test_pseudonym_data.conf | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/fs/fs_pseudonym.c b/src/fs/fs_pseudonym.c index eb8c43ddf..7394fb0c6 100644 --- a/src/fs/fs_pseudonym.c +++ b/src/fs/fs_pseudonym.c | |||
@@ -1266,7 +1266,6 @@ static gcry_ctx_t | |||
1266 | get_context_from_pseudonym (struct GNUNET_FS_PseudonymIdentifier *pseudonym) | 1266 | get_context_from_pseudonym (struct GNUNET_FS_PseudonymIdentifier *pseudonym) |
1267 | { | 1267 | { |
1268 | gcry_ctx_t ctx; | 1268 | gcry_ctx_t ctx; |
1269 | gcry_mpi_t ONE; | ||
1270 | gcry_mpi_t q_x; | 1269 | gcry_mpi_t q_x; |
1271 | gcry_mpi_t q_y; | 1270 | gcry_mpi_t q_y; |
1272 | gcry_mpi_point_t q; | 1271 | gcry_mpi_point_t q; |
@@ -1288,10 +1287,7 @@ get_context_from_pseudonym (struct GNUNET_FS_PseudonymIdentifier *pseudonym) | |||
1288 | return NULL; | 1287 | return NULL; |
1289 | } | 1288 | } |
1290 | q = gcry_mpi_point_new (256); | 1289 | q = gcry_mpi_point_new (256); |
1291 | ONE = gcry_mpi_new (1); | 1290 | gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE); |
1292 | gcry_mpi_set_ui (ONE, 1); | ||
1293 | gcry_mpi_point_set (q, q_x, q_y, ONE); /* FIXME: convenience function 'set_affine'? */ | ||
1294 | gcry_mpi_release (ONE); | ||
1295 | gcry_mpi_release (q_x); | 1291 | gcry_mpi_release (q_x); |
1296 | gcry_mpi_release (q_y); | 1292 | gcry_mpi_release (q_y); |
1297 | 1293 | ||
@@ -1392,10 +1388,8 @@ GNUNET_FS_pseudonym_derive_verification_key (struct GNUNET_FS_PseudonymIdentifie | |||
1392 | fprintf (stderr, "\nVerification key public point value V := q + hG:\n"); | 1388 | fprintf (stderr, "\nVerification key public point value V := q + hG:\n"); |
1393 | gcry_mpi_dump (v_x); | 1389 | gcry_mpi_dump (v_x); |
1394 | gcry_mpi_dump (v_y); | 1390 | gcry_mpi_dump (v_y); |
1395 | fprintf (stderr, " <=== WTF!?\n"); | ||
1396 | } | 1391 | } |
1397 | 1392 | ||
1398 | |||
1399 | gcry_mpi_point_release (v); | 1393 | gcry_mpi_point_release (v); |
1400 | gcry_ctx_release (ctx); | 1394 | gcry_ctx_release (ctx); |
1401 | 1395 | ||
@@ -1442,7 +1436,6 @@ GNUNET_FS_pseudonym_verify (const struct GNUNET_FS_PseudonymSignaturePurpose *pu | |||
1442 | gcry_sexp_t pk_sexpr; | 1436 | gcry_sexp_t pk_sexpr; |
1443 | size_t size; | 1437 | size_t size; |
1444 | gcry_ctx_t ctx; | 1438 | gcry_ctx_t ctx; |
1445 | gcry_mpi_t ONE; | ||
1446 | gcry_mpi_t r; | 1439 | gcry_mpi_t r; |
1447 | gcry_mpi_t s; | 1440 | gcry_mpi_t s; |
1448 | gcry_mpi_point_t q; | 1441 | gcry_mpi_point_t q; |
@@ -1502,10 +1495,7 @@ GNUNET_FS_pseudonym_verify (const struct GNUNET_FS_PseudonymSignaturePurpose *pu | |||
1502 | return GNUNET_SYSERR; | 1495 | return GNUNET_SYSERR; |
1503 | } | 1496 | } |
1504 | q = gcry_mpi_point_new (256); | 1497 | q = gcry_mpi_point_new (256); |
1505 | ONE = gcry_mpi_new (1); | 1498 | gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE); |
1506 | gcry_mpi_set_ui (ONE, 1); | ||
1507 | gcry_mpi_point_set (q, q_x, q_y, ONE); /* FIXME: convenience function 'set_affine'? */ | ||
1508 | gcry_mpi_release (ONE); | ||
1509 | gcry_mpi_release (q_x); | 1499 | gcry_mpi_release (q_x); |
1510 | gcry_mpi_release (q_y); | 1500 | gcry_mpi_release (q_y); |
1511 | 1501 | ||
diff --git a/src/fs/test_pseudonym_data.conf b/src/fs/test_pseudonym_data.conf index 55230073e..837908e51 100644 --- a/src/fs/test_pseudonym_data.conf +++ b/src/fs/test_pseudonym_data.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | # General settings | 1 | # General settings |
2 | [client] | 2 | [fs] |
3 | HOME = "/tmp/gnunet-pseudonym-test" | 3 | HOME = "/tmp/gnunet-pseudonym-test" |
4 | 4 | ||
5 | [TESTING] | 5 | [TESTING] |