commit 3d2ddee73b9ac0d340403f1fded562a67a01ba3e
parent ad8ed9efd8fd833942b070cc7495eef1cb419560
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date: Mon, 15 Jan 2024 15:20:49 +0100
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat:
7 files changed, 18 insertions(+), 47 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,7 @@ src/util/donau-config
src/testing/test_donau_api_home/
src/donau-tools/donau-dbinit
vgcore.*
+src/testing/test_donau_api_rsa
+src/testing/test_donau_api_c
+src/testing/test_donau_api_rsa
+src/testing/test_donau_api_cs
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = \
json \
pq \
donaudb \
- donau \
+ #donau \
lib \
donau-tools \
testing
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
@@ -7,17 +7,18 @@ if USE_COVERAGE
endif
lib_LTLIBRARIES = \
- libtalerjson.la
+ libdonaujson.la
-libtalerjson_la_SOURCES = \
+libdonaujson_la_SOURCES = \
json.c \
json_helper.c \
- json_pack.c
+ json_pack.c \
+ donau_json.c
-libtalerjson_la_LDFLAGS = \
+libdonaujson_la_LDFLAGS = \
-version-info 1:0:1 \
-no-undefined
-libtalerjson_la_LIBADD = \
+libdonaujson_la_LIBADD = \
$(top_builddir)/src/util/libdonauutil.la \
-lgnunetjson \
-lgnunetutil \
diff --git a/src/json/donau_json.c b/src/json/donau_json.c
@@ -160,7 +160,7 @@ parse_donation_unit_group (void *cls,
json_t *root,
struct GNUNET_JSON_Specification *spec)
{
- struct DonationUnitGroup *group = spec->ptr;
+ struct DONAU_DonationUnitGroup *group = spec->ptr;
const char *cipher;
const char *currency = cls;
struct GNUNET_JSON_Specification gspec[] = {
@@ -213,18 +213,4 @@ DONAU_JSON_spec_donation_unit_group (const char *name,
};
return ret;
-}
-
-struct GNUNET_JSON_PackSpec
-DONAU_JSON_pack_uint32 (const char *name,
- uint32_t num)
-{
- struct GNUNET_JSON_PackSpec ps = {
- .field_name = name,
- .object = json_integer ((json_int_t) num)
- };
-
- GNUNET_assert (num <= ULONG_MAX);
-
- return ps;
}
\ No newline at end of file
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -21,11 +21,13 @@ libdonau_la_LDFLAGS = \
-no-undefined
libdonau_la_SOURCES = \
donau_api_handle.c \
- donau_api_charity_get.c
+ donau_api_charity_get.c \
+ donau_api_curl_defaults.c donau_api_curl_defaults.h
## maybe need libtalercurl
libdonau_la_LIBADD = \
$(top_builddir)/src/util/libdonauutil.la \
+ $(top_builddir)/src/json/libdonaujson.la \
-lgnunetcurl \
-lgnunetjson \
-lgnunetutil \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -16,14 +16,14 @@ libdonauutil_la_SOURCES = \
charity_signatures.c \
donau_signatures.c \
donau_os_installation.c \
- crypto_helper_cs.c \
- crypto_helper_rsa.c \
- crypto_helper_esign.c
+ donau_crypto.c
libdonauutil_la_LIBADD = \
-ltalerutil \
-lgnunetutil \
+ -ltalerjson \
-lgnunetjson \
+ -lgnunetcurl \
-lsodium \
-ljansson \
$(LIBGCRYPT_LIBS) \
diff --git a/src/util/donau_crypto.c b/src/util/donau_crypto.c
@@ -68,8 +68,6 @@ DONAU_donation_unit_pub_cmp (const struct DONAU_DonationUnitPublicKey *donation_
donation_unit2->bsign_pub_key->cipher)
return (donation_unit1->bsign_pub_key->cipher >
donation_unit2->bsign_pub_key->cipher) ? 1 : -1;
- if (donation_unit1->age_mask.bits != donation_unit2->age_mask.bits)
- return (donation_unit1->age_mask.bits > donation_unit2->age_mask.bits) ? 1 : -1;
return GNUNET_CRYPTO_bsign_pub_cmp (donation_unit1->bsign_pub_key,
donation_unit2->bsign_pub_key);
}
@@ -92,26 +90,6 @@ DONAU_donation_unit_pub_free (struct DONAU_DonationUnitPublicKey *donation_unit_
}
}
-
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Structure we hash to compute the group key for
- * a donation unit group.
- */
-struct DonationUnitGroupP
-{
- /**
- * Value of coins in this donation unit group.
- */
- struct TALER_AmountNBO value;
-
- /**
- * Cipher used for the denomination, in NBO.
- */
- uint32_t cipher GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
void
DONAU_donatin_unit_group_get_key (
const struct DONAU_DonationUnitGroup *dg,
