diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2023-11-28 11:42:37 +0900 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2023-11-28 11:42:37 +0900 |
| commit | 5ec2b74a0e91c4799f521fcc71923506777ef515 (patch) | |
| tree | 3f4bb3f8e8d831b9ccbc5e520586a3a89153259a | |
| parent | 35d52699018a62851ba1420715d4bec3818a190a (diff) | |
| parent | fd2f18d4fbf8b84eb9444972b1660bb7712d192e (diff) | |
Merge branch 'master' of git+ssh://git.taler.net/exchange
| -rw-r--r-- | contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po | 6 | ||||
| -rw-r--r-- | src/include/taler_crypto_lib.h | 2 | ||||
| -rw-r--r-- | src/pq/pq_result_helper.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po index 69679e94f..6cd899442 100644 --- a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po +++ b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "Terms Of Service" -msgstr "Allgemeine Geschaeftsbedingungen" +msgid "Terms of Service" +msgstr "Allgemeine Geschäftsbedingungen" -msgid "Last Updated: 12.4.2019" +msgid "Last Updated: 27.11.2023" msgstr "" msgid "" diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 6f5b403b0..dc431af53 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -5867,7 +5867,7 @@ struct TALER_DenominationGroup enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher; /** - * Age mask for the denomiation. + * Age mask for the denomination. */ struct TALER_AgeMask age_mask; diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c index 9acf80716..9bd3fdb49 100644 --- a/src/pq/pq_result_helper.c +++ b/src/pq/pq_result_helper.c @@ -1208,7 +1208,7 @@ extract_array_generic ( in += sizeof(val); /* total size for this array-entry */ - FAIL_IF (sizeof(ap) > sz); + FAIL_IF (sizeof(ap) != sz); GNUNET_memcpy (&ap, in, |