[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29508 - in gnunet/src: fs gns include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29508 - in gnunet/src: fs gns include util |
Date: |
Tue, 24 Sep 2013 08:27:24 +0200 |
Author: grothoff
Date: 2013-09-24 08:27:24 +0200 (Tue, 24 Sep 2013)
New Revision: 29508
Modified:
gnunet/src/fs/fs_publish.c
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/include/gnunet_protocols.h
gnunet/src/util/crypto_ecc.c
Log:
-fix doxygen
Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c 2013-09-23 22:00:28 UTC (rev 29507)
+++ gnunet/src/fs/fs_publish.c 2013-09-24 06:27:24 UTC (rev 29508)
@@ -442,8 +442,8 @@
/**
* Function called asking for the current (encoded)
* block to be processed. After processing the
- * client should either call #GNUNET_FS_tree_encode_next
- * or (on error) #GNUNET_FS_tree_encode_finish.
+ * client should either call #GNUNET_FS_tree_encoder_next
+ * or (on error) #GNUNET_FS_tree_encoder_finish.
*
* @param cls closure
* @param chk content hash key for the block
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2013-09-23 22:00:28 UTC (rev 29507)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2013-09-24 06:27:24 UTC (rev 29508)
@@ -1292,7 +1292,7 @@
* @param kind value kind
* @param key field key
* @param value field value
- * @return #MHD_YES to continue to iterate
+ * @return MHD_YES to continue to iterate
*/
static int
con_val_iter (void *cls,
@@ -1341,8 +1341,8 @@
* @a upload_data provided; the method must update this
* value to the number of bytes NOT processed;
* @param con_cls pointer to location where we store the 'struct Request'
- * @return #MHD_YES if the connection was handled successfully,
- * #MHD_NO if the socket must be closed due to a serious
+ * @return MHD_YES if the connection was handled successfully,
+ * MHD_NO if the socket must be closed due to a serious
* error while handling the request
*/
static int
@@ -1564,7 +1564,7 @@
* @param cls NULL
* @param connection connection handle
* @param con_cls value as set by the last call to
- * the #MHD_AccessHandlerCallback, should be our `struct Socks5Request`
+ * the MHD_AccessHandlerCallback, should be our `struct Socks5Request`
* @param toe reason for request termination (ignored)
*/
static void
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2013-09-23 22:00:28 UTC (rev
29507)
+++ gnunet/src/include/gnunet_crypto_lib.h 2013-09-24 06:27:24 UTC (rev
29508)
@@ -156,15 +156,7 @@
/**
* Q consists of an x- and a y-value, each mod p (256 bits),
* given here in affine coordinates.
- *
- * FIXME: this coordinate will be removed in the future (compressed point!).
*/
- unsigned char q_x[256 / 8];
-
- /**
- * Q consists of an x- and a y-value, each mod p (256 bits),
- * given here in affine coordinates.
- */
unsigned char q_y[256 / 8];
};
@@ -182,14 +174,6 @@
*/
unsigned char q_x[256 / 8];
- /**
- * Q consists of an x- and a y-value, each mod p (256 bits),
- * given here in affine coordinates.
- *
- * FIXME: this coordinate will be removed in the future (compressed point!).
- */
- unsigned char q_y[256 / 8];
-
};
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2013-09-23 22:00:28 UTC (rev
29507)
+++ gnunet/src/include/gnunet_protocols.h 2013-09-24 06:27:24 UTC (rev
29508)
@@ -2066,7 +2066,17 @@
*/
#define GNUNET_MESSAGE_TYPE_MULTICAST_GROUP_END
+/**
+ *
+ */
+#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST
+/**
+ *
+ */
+#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL
+
+
/*******************************************************************************
* PSYC message types
******************************************************************************/
Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c 2013-09-23 22:00:28 UTC (rev 29507)
+++ gnunet/src/util/crypto_ecc.c 2013-09-24 06:27:24 UTC (rev 29508)
@@ -35,10 +35,8 @@
* structs that use 256 bits, so using a bigger curve will require
* changes that break stuff badly. The name of the curve given here
* must be agreed by all peers and be supported by libgcrypt.
- *
- * NOTE: this will change to Curve25519 before GNUnet 0.10.0.
*/
-#define CURVE "NIST P-256"
+#define CURVE "Ed25519"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
@@ -199,7 +197,7 @@
priv->d,
sizeof (priv->d));
rc = gcry_sexp_build (&result, NULL,
- "(private-key(ecdsa(curve \"" CURVE "\")(d %m)))",
+ "(private-key(ecc(curve \"" CURVE "\")(d %m)))",
d);
gcry_mpi_release (d);
if (0 != rc)
@@ -219,68 +217,6 @@
/**
- * Initialize public key struct from the respective point
- * on the curve.
- *
- * @param q point on curve
- * @param pub public key struct to initialize
- * @param ctx context to use for ECC operations
- */
-static void
-point_to_public_sign_key (gcry_mpi_point_t q,
- gcry_ctx_t ctx,
- struct GNUNET_CRYPTO_EccPublicSignKey *pub)
-{
- gcry_mpi_t q_x;
- gcry_mpi_t q_y;
-
- q_x = gcry_mpi_new (256);
- q_y = gcry_mpi_new (256);
- if (gcry_mpi_ec_get_affine (q_x, q_y, q, ctx))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "get_affine failed", 0);
- return;
- }
-
- mpi_print (pub->q_x, sizeof (pub->q_x), q_x);
- mpi_print (pub->q_y, sizeof (pub->q_y), q_y);
- gcry_mpi_release (q_x);
- gcry_mpi_release (q_y);
-}
-
-
-/**
- * Initialize public key struct from the respective point
- * on the curve.
- *
- * @param q point on curve
- * @param pub public key struct to initialize
- * @param ctx context to use for ECC operations
- */
-static void
-point_to_public_encrypt_key (gcry_mpi_point_t q,
- gcry_ctx_t ctx,
- struct GNUNET_CRYPTO_EccPublicEncryptKey *pub)
-{
- gcry_mpi_t q_x;
- gcry_mpi_t q_y;
-
- q_x = gcry_mpi_new (256);
- q_y = gcry_mpi_new (256);
- if (gcry_mpi_ec_get_affine (q_x, q_y, q, ctx))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "get_affine failed", 0);
- return;
- }
-
- mpi_print (pub->q_x, sizeof (pub->q_x), q_x);
- mpi_print (pub->q_y, sizeof (pub->q_y), q_y);
- gcry_mpi_release (q_x);
- gcry_mpi_release (q_y);
-}
-
-
-/**
* Extract the public key for the given private key.
*
* @param priv the private key
@@ -292,16 +228,22 @@
{
gcry_sexp_t sexp;
gcry_ctx_t ctx;
- gcry_mpi_point_t q;
+ gcry_mpi_t q_y;
sexp = decode_private_key (priv);
+ gcry_sexp_dump (sexp);
GNUNET_assert (NULL != sexp);
GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, sexp, NULL));
gcry_sexp_release (sexp);
- q = gcry_mpi_ec_get_point ("q", ctx, 0);
- point_to_public_sign_key (q, ctx, pub);
+ if (NULL == (q_y = gcry_mpi_ec_get_mpi ("y", ctx, 0)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_mpi_ec_get_mpi failed", 0);
+ return;
+ }
+ mpi_print (pub->q_y, sizeof (pub->q_y), q_y);
gcry_ctx_release (ctx);
- gcry_mpi_point_release (q);
+ // gcry_mpi_release (q_y); /* needed? we set copy to 0... */
}
@@ -317,16 +259,20 @@
{
gcry_sexp_t sexp;
gcry_ctx_t ctx;
- gcry_mpi_point_t q;
+ gcry_mpi_t q_x;
sexp = decode_private_key (priv);
GNUNET_assert (NULL != sexp);
GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, sexp, NULL));
gcry_sexp_release (sexp);
- q = gcry_mpi_ec_get_point ("q", ctx, 0);
- point_to_public_encrypt_key (q, ctx, pub);
+ if (NULL == (q_x = gcry_mpi_ec_get_mpi ("x", ctx, 0)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_mpi_ec_get_mpi failed", 0);
+ return;
+ }
+ mpi_print (pub->q_x, sizeof (pub->q_x), q_x);
gcry_ctx_release (ctx);
- gcry_mpi_point_release (q);
}
@@ -401,23 +347,14 @@
decode_public_sign_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pub)
{
gcry_sexp_t pub_sexp;
- gcry_mpi_t q_x;
gcry_mpi_t q_y;
- gcry_mpi_point_t q;
gcry_ctx_t ctx;
- mpi_scan (&q_x, pub->q_x, sizeof (pub->q_x));
mpi_scan (&q_y, pub->q_y, sizeof (pub->q_y));
- q = gcry_mpi_point_new (256);
- gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE);
- gcry_mpi_release (q_x);
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
+ gcry_mpi_ec_set_mpi ("y", q_y, ctx);
gcry_mpi_release (q_y);
- /* initialize 'ctx' with 'q' */
- GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
- gcry_mpi_ec_set_point ("q", q, ctx);
- gcry_mpi_point_release (q);
-
/* convert 'ctx' to 'sexp' */
GNUNET_assert (0 == gcry_pubkey_get_sexp (&pub_sexp, GCRY_PK_GET_PUBKEY,
ctx));
gcry_ctx_release (ctx);
@@ -453,7 +390,7 @@
int rc;
if (0 != (rc = gcry_sexp_build (&s_keyparam, NULL,
- "(genkey(ecdsa(curve \"" CURVE "\")))")))
+ "(genkey(ecc(curve \"" CURVE "\")))")))
{
LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
return NULL;
@@ -777,7 +714,7 @@
GNUNET_CRYPTO_hash (purpose, ntohl (purpose->size), &hc);
if (0 != (rc = gcry_sexp_build (&data, NULL,
- "(data(flags rfc6979)(hash %s %b))",
+ "(data(flags eddsa)(hash %s %b))",
"sha512",
sizeof (hc),
&hc)))
@@ -869,7 +806,7 @@
mpi_scan (&r, sig->r, sizeof (sig->r));
mpi_scan (&s, sig->s, sizeof (sig->s));
if (0 != (rc = gcry_sexp_build (&sig_sexpr, NULL,
- "(sig-val(ecdsa(r %m)(s %m)))",
+ "(sig-val(eddsa(r %m)(s %m)))",
r, s)))
{
LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
@@ -913,22 +850,16 @@
{
gcry_sexp_t pub_sexp;
gcry_mpi_t q_x;
- gcry_mpi_t q_y;
- gcry_mpi_point_t q;
gcry_ctx_t ctx;
+ int rc;
mpi_scan (&q_x, pub->q_x, sizeof (pub->q_x));
- mpi_scan (&q_y, pub->q_y, sizeof (pub->q_y));
- q = gcry_mpi_point_new (256);
- gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE);
+ /* initialize 'ctx' with 'x' */
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
+ if (0 != (rc = gcry_mpi_ec_set_mpi ("x", q_x, ctx)))
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_set_mpi", rc);
gcry_mpi_release (q_x);
- gcry_mpi_release (q_y);
- /* initialize 'ctx' with 'q' */
- GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
- gcry_mpi_ec_set_point ("q", q, ctx);
- gcry_mpi_point_release (q);
-
/* convert 'ctx' to 'sexp' */
GNUNET_assert (0 == gcry_pubkey_get_sexp (&pub_sexp, GCRY_PK_GET_PUBKEY,
ctx));
gcry_ctx_release (ctx);
@@ -957,6 +888,7 @@
gcry_mpi_t result_x;
gcry_mpi_t result_y;
unsigned char xbuf[256 / 8];
+ int rc;
/* first, extract the q = dP value from the public key */
if (! (pub_sexpr = decode_public_encrypt_key (pub)))
@@ -964,6 +896,11 @@
GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, pub_sexpr, NULL));
gcry_sexp_release (pub_sexpr);
q = gcry_mpi_ec_get_point ("q", ctx, 0);
+ if (NULL == q)
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_get_point", 0);
+ return GNUNET_SYSERR;
+ }
/* second, extract the d value from our private key */
mpi_scan (&d, priv->d, sizeof (priv->d));
@@ -977,9 +914,9 @@
/* finally, convert point to string for hashing */
result_x = gcry_mpi_new (256);
result_y = gcry_mpi_new (256);
- if (gcry_mpi_ec_get_affine (result_x, result_y, result, ctx))
+ if (0 != (rc = gcry_mpi_ec_get_affine (result_x, result_y, result, ctx)))
{
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "get_affine failed", 0);
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_get_affine", rc);
gcry_mpi_point_release (result);
gcry_ctx_release (ctx);
return GNUNET_SYSERR;
@@ -1087,37 +1024,49 @@
gcry_mpi_t h;
gcry_mpi_t n;
gcry_mpi_t h_mod_n;
- gcry_mpi_t q_x;
gcry_mpi_t q_y;
gcry_mpi_point_t q;
gcry_mpi_point_t v;
+ int rc;
GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
- /* obtain point 'q' from original public key */
- mpi_scan (&q_x, pub->q_x, sizeof (pub->q_x));
+ /* obtain point 'y' from original public key */
mpi_scan (&q_y, pub->q_y, sizeof (pub->q_y));
-
- q = gcry_mpi_point_new (0);
- gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE);
- gcry_mpi_release (q_x);
+ if (0 != (rc = gcry_mpi_ec_set_mpi ("y", q_y, ctx)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_set_mpi", rc);
+ GNUNET_assert (0);
+ }
gcry_mpi_release (q_y);
/* calulcate h_mod_n = h % n */
h = derive_h (pub, label, context);
n = gcry_mpi_ec_get_mpi ("n", ctx, 1);
+ GNUNET_assert (NULL != n);
h_mod_n = gcry_mpi_new (256);
gcry_mpi_mod (h_mod_n, h, n);
/* calculate v = h_mod_n * q */
v = gcry_mpi_point_new (0);
+ q = gcry_mpi_ec_get_point ("q", ctx, 0);
+ GNUNET_assert (NULL != q);
gcry_mpi_ec_mul (v, h_mod_n, q, ctx);
gcry_mpi_release (h_mod_n);
gcry_mpi_release (h);
gcry_mpi_release (n);
gcry_mpi_point_release (q);
/* convert point 'v' to public key that we return */
- point_to_public_sign_key (v, ctx, result);
+ if (0 != (rc = gcry_mpi_ec_set_point ("q", v, ctx)))
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_set_point", rc);
gcry_mpi_point_release (v);
+ if (NULL == (q_y = gcry_mpi_ec_get_mpi ("y", ctx, 0)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_mpi_ec_get_mpi", 0);
+ GNUNET_assert (0);
+ }
+ mpi_print (result->q_y, sizeof (result->q_y), q_y);
+ // gcry_mpi_release (q_y); /* needed? we set copy to 0... */
gcry_ctx_release (ctx);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29508 - in gnunet/src: fs gns include util,
gnunet <=