[taler-anastasis] 06/06: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 7062901e6096ec8b299c58f89b4fe795144eb0b1
Merge: 319cbe9 a6ef5c5
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Thu Oct 22 18:51:59 2020 +0200

    merge

 README                                           |  2 +-
 contrib/redux.de.json                            |  2 --
 contrib/uncrustify_precommit                     |  2 +-
 doc/ledger-sme-legal-check.txt                   |  2 +-
 doc/manual.texi                                  | 12 ++++++------
 doc/merchant-api.content.texi                    |  6 +++---
 doc/next_steps.txt                               |  2 +-
 doc/system-documentation/client_architecture.tex |  2 +-
 doc/system-documentation/design.tex              |  6 +++---
 doc/system-documentation/implementation.tex      | 10 +++++-----
 doc/system-documentation/introduction.tex        |  4 ++--
 doc/system-documentation/related_work.tex        |  2 +-
 doc/system-documentation/thesis.tex              |  2 +-
 doc/thesis/Journal.tex                           |  6 +++---
 doc/thesis/client_architecture.tex               |  2 +-
 doc/thesis/design.tex                            |  6 +++---
 doc/thesis/implementation.tex                    | 10 +++++-----
 doc/thesis/introduction.tex                      |  4 ++--
 doc/thesis/related_work.tex                      |  2 +-
 doc/thesis/rest_api_documentation.tex            |  2 +-
 doc/thesis/thesis.tex                            |  2 +-
 doc/www/anastasis-website/about.html             |  2 +-
 doc/ypsomed/ypsomed.tex                          |  2 +-
 m4/ax_lib_postgresql.m4                          |  2 +-
 src/backend/anastasis-httpd.c                    |  2 +-
 src/backend/anastasis-httpd_policy.c             |  2 +-
 src/backend/anastasis-httpd_policy_upload.c      |  4 ++--
 src/backend/anastasis-httpd_truth.c              |  2 +-
 src/cli/test_anastasis_cli.conf                  |  6 +++---
 src/include/anastasis_database_lib.h             |  2 +-
 src/include/anastasis_database_plugin.h          |  6 +++---
 src/include/anastasis_service.h                  |  2 +-
 src/lib/anastasis.c                              |  4 ++--
 src/lib/anastasis_api_redux.c                    |  2 +-
 src/lib/test_anastasis_api.conf                  |  6 +++---
 src/lib/testing_cmd_challenge_answer.c           |  2 +-
 src/stasis/plugin_anastasis_postgres.c           | 11 +++++++----
 src/stasis/test_anastasis_db.c                   |  4 +---
 src/util/anastasis_crypto.c                      |  2 +-
 src/util/paths.conf                              |  2 +-
 40 files changed, 76 insertions(+), 77 deletions(-)

diff --cc src/include/anastasis_database_lib.h
index 0deb557,a2e0287..cff4635
--- a/src/include/anastasis_database_lib.h
+++ b/src/include/anastasis_database_lib.h
@@@ -55,12 -55,10 +55,12 @@@ enum ANASTASIS_DB_QueryStatu
     * Already valid code stored under this public key, please use the valid 
code
     */
    ANASTASIS_DB_STATUS_VALID_CODE_STORED = -6,
 +
    /**
-    * Provided Challenge code didnt match the server generated code
+    * Provided Challenge code didn't match the server generated code
     */
    ANASTASIS_DB_STATUS_CHALLENGE_CODE_MISSMATCH = -5,
 +
    /**
     * Update failed because the old recovery data hash does not match what we 
previously had in the DB.
     */
diff --cc src/include/anastasis_service.h
index b07cbe1,0be7a8a..55aedab
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@@ -413,8 -414,9 +413,8 @@@ typedef voi
   *
   * @param ctx the CURL context used to connect to the backend
   * @param backend_url backend's base URL, including final "/"
 - * @param anastasis_pub public key of the user's account
   * @param anastasis_priv private key of the user's account
-  * @param prev_recovery_data_hash hash of the previous uploaded recovery 
document
+  * @param prev_recovery_data_hash hash of the previous policy update, NULL 
for the first upload ever
   * @param recovery_data policy data to be stored
   * @param recovery_data_size number of bytes in @a recovery_data
   * @param payment_requested #GNUNET_YES if the client wants to pay more for 
the account now
diff --cc src/stasis/test_anastasis_db.c
index 83afdcc,fcb51a7..1b4bd1e
--- a/src/stasis/test_anastasis_db.c
+++ b/src/stasis/test_anastasis_db.c
@@@ -273,9 -273,8 +273,7 @@@ run (void *cls
                                           &truth_public_key,
                                           123));
  
- 
--
 -  FAILIF (ANASTASIS_DB_STATUS_SUCCESS_ONE_RESULT !=
 +  FAILIF (ANASTASIS_DB_STATUS_VALID_CODE_STORED !=
            plugin->verify_challenge_code (plugin->cls,
                                           &truth_public_key,
                                           challenge_code));

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.