[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: geq redefinition breaks tex
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: geq redefinition breaks texi2pdf, instead just avoid @geq |
Date: |
Sun, 24 Feb 2019 07:55:26 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new d31e933a3 geq redefinition breaks texi2pdf, instead just avoid @geq
d31e933a3 is described below
commit d31e933a35007204ca4c7f98c209b4f7e14f9ecc
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Feb 24 07:55:21 2019 +0100
geq redefinition breaks texi2pdf, instead just avoid @geq
---
doc/handbook/chapters/installation.texi | 8 ++---
doc/handbook/gnunet.texi | 5 ---
src/curl/curl.c | 2 ++
src/util/crypto_ecc.c | 60 ++++++++++++++++++++++++++++-----
src/util/perf_crypto_asymmetric.c | 2 +-
5 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/doc/handbook/chapters/installation.texi
b/doc/handbook/chapters/installation.texi
index 9cd2b1bcc..a907a1046 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -28,13 +28,13 @@ link to the project websites.
The mandatory libraries and applications are
@itemize @bullet
@item libtool
address@hidden autoconf @geq{}2.59
address@hidden automake @geq{}1.11.1
address@hidden autoconf 2.59 or above
address@hidden automake 1.11.1 or above
@item pkg-config
address@hidden libgcrypt @geq{}1.6
address@hidden libgcrypt 1.6 or above
@item libextractor
@item libidn
address@hidden libmicrohttpd @geq{}0.9.52
address@hidden libmicrohttpd 0.9.52 or above
@item libnss
@item libunistring
@item gettext
diff --git a/doc/handbook/gnunet.texi b/doc/handbook/gnunet.texi
index 07d18435b..a479d2059 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/handbook/gnunet.texi
@@ -5,11 +5,6 @@
@settitle GNUnet Reference Manual
@c @exampleindent 2
address@hidden macros for backwards compatibility
address@hidden geq{}
->=
address@hidden macro
-
@c Set Versions which might be used in more than one place:
@set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet
@set PYPI-URL https://pypi.python.org/packages/source
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 3443525e3..e413d1cf5 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -426,6 +426,7 @@ download_get_result (struct GNUNET_CURL_DownloadBuffer *db,
return json;
}
+
/**
* Add custom request header.
*
@@ -445,6 +446,7 @@ GNUNET_CURL_append_header (struct GNUNET_CURL_Context *ctx,
return GNUNET_OK;
}
+
/**
* Run the main event loop for the Taler interaction.
*
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index ac7662a10..a720d6c2b 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -789,19 +789,40 @@ GNUNET_CRYPTO_cmp_peer_identity (const struct
GNUNET_PeerIdentity *first,
static gcry_sexp_t
data_to_eddsa_value (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose)
{
- struct GNUNET_HashCode hc;
gcry_sexp_t data;
int rc;
+#if 1
+ struct GNUNET_HashCode hc;
+
+ GNUNET_CRYPTO_hash (purpose,
+ ntohl (purpose->size),
+ &hc);
+ if (0 != (rc = gcry_sexp_build (&data, NULL,
+ "(data(flags eddsa)(hash-algo %s)(value %b))",
+ "sha512",
+ (int)sizeof (hc),
+ &hc)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_sexp_build",
+ rc);
+ return NULL;
+ }
+#else
GNUNET_CRYPTO_hash (purpose, ntohl (purpose->size), &hc);
if (0 != (rc = gcry_sexp_build (&data, NULL,
"(data(flags eddsa)(hash-algo %s)(value %b))",
"sha512",
- (int)sizeof (hc), &hc)))
+ ntohl (purpose->size),
+ purpose)))
{
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_sexp_build",
+ rc);
return NULL;
}
+#endif
return data;
}
@@ -816,19 +837,38 @@ data_to_eddsa_value (const struct
GNUNET_CRYPTO_EccSignaturePurpose *purpose)
static gcry_sexp_t
data_to_ecdsa_value (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose)
{
- struct GNUNET_HashCode hc;
gcry_sexp_t data;
int rc;
- GNUNET_CRYPTO_hash (purpose, ntohl (purpose->size), &hc);
+#if 1
+ struct GNUNET_HashCode hc;
+
+ GNUNET_CRYPTO_hash (purpose,
+ ntohl (purpose->size),
+ &hc);
if (0 != (rc = gcry_sexp_build (&data, NULL,
"(data(flags rfc6979)(hash %s %b))",
"sha512",
(int)sizeof (hc), &hc)))
{
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_sexp_build",
+ rc);
+ return NULL;
+ }
+#else
+ if (0 != (rc = gcry_sexp_build (&data, NULL,
+ "(data(flags rfc6979)(hash %s %b))",
+ "sha512",
+ ntohl (purpose->size),
+ purpose)))
+ {
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR,
+ "gcry_sexp_build",
+ rc);
return NULL;
}
+#endif
return data;
}
@@ -877,8 +917,12 @@ GNUNET_CRYPTO_ecdsa_sign (const struct
GNUNET_CRYPTO_EcdsaPrivateKey *priv,
return GNUNET_SYSERR;
}
gcry_sexp_release (sig_sexp);
- GNUNET_CRYPTO_mpi_print_unsigned (sig->r, sizeof (sig->r), rs[0]);
- GNUNET_CRYPTO_mpi_print_unsigned (sig->s, sizeof (sig->s), rs[1]);
+ GNUNET_CRYPTO_mpi_print_unsigned (sig->r,
+ sizeof (sig->r),
+ rs[0]);
+ GNUNET_CRYPTO_mpi_print_unsigned (sig->s,
+ sizeof (sig->s),
+ rs[1]);
gcry_mpi_release (rs[0]);
gcry_mpi_release (rs[1]);
diff --git a/src/util/perf_crypto_asymmetric.c
b/src/util/perf_crypto_asymmetric.c
index b2b9f5692..a2cb3a6ce 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -29,7 +29,7 @@
static struct GNUNET_TIME_Absolute start;
-#define l 50
+#define l 500
struct TestSig
{
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: geq redefinition breaks texi2pdf, instead just avoid @geq,
gnunet <=