[taler-anastasis] 03/03: 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 6f7d7c37acdcbfc1157a189317136d77bd4c8fcd
Merge: d83454e ad92efe
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Thu Oct 29 20:50:53 2020 +0100

    merge

 doc/ypsomed/ypsomed.tex                           | 41 +++++++------
 src/backend/anastasis-httpd.c                     |  1 +
 src/backend/anastasis-httpd_truth.c               |  3 +-
 src/backend/anastasis_authorization_plugin_file.c | 64 ++++++++++++++------
 src/include/anastasis_service.h                   |  3 +-
 src/include/anastasis_testing_lib.h               | 27 ++++++++-
 src/lib/Makefile.am                               |  1 +
 src/lib/anastasis_api_challenge_run.c             | 18 +++++-
 src/lib/test_anastasis_api.c                      | 20 ++++---
 src/lib/testing_api_cmd_challenge_run.c           | 56 ++++++++++++++++-
 src/lib/testing_api_cmd_keyshare_lookup.c         | 45 +++++++++++++-
 src/lib/testing_api_trait_code.c                  | 73 +++++++++++++++++++++++
 12 files changed, 298 insertions(+), 54 deletions(-)


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