[taler-anastasis] 04/04: Merge branch 'master' of ssh://git.taler.net/anastasis

[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 2a0f1804375c9af49ba126250c4b9cea6202d064
Merge: 9057dde 75e2deb
Author: Dennis Neufeld <address@hidden>
AuthorDate: Thu May 7 01:16:45 2020 +0000

    Merge branch 'master' of ssh://git.taler.net/anastasis

 src/include/anastasis.h                |   8 +-
 src/include/anastasis_testing_lib.h    |  75 ++++++++++-
 src/lib/Makefile.am                    |   8 +-
 src/lib/anastasis.c                    | 234 +++++++++++++++++----------------
 src/lib/test_anastasis.c               |   5 +-
 src/lib/testing_cmd_challenge_answer.c | 178 +++++++++++++++++++++++++
 src/lib/testing_cmd_recover_secret.c   |  99 +++++++++++++-
 src/lib/testing_trait_challenge.c      |  70 ++++++++++
 src/lib/testing_trait_recovery.c       |  70 ++++++++++
 9 files changed, 620 insertions(+), 127 deletions(-)

diff --cc src/lib/test_anastasis.c
index 931fdfb,e82c05f..7d1fd87
--- a/src/lib/test_anastasis.c
+++ b/src/lib/test_anastasis.c
@@@ -241,23 -241,21 +241,26 @@@ run (void *cls
                                           "truth-create-2",
                                           "truth-create-3",
                                           NULL),
 -    /*
 +
      ANASTASIS_TESTING_cmd_secret_share ("secret-share-1",
                                          anastasis_url,
 +                                        
ANASTASIS_TESTING_make_id_data_example (
 +                                          "MaxMuster123456789"),
 +                                        "core secret",
 +                                        strlen ("core secret"),
                                          MHD_HTTP_PAYMENT_REQUIRED,
                                          ANASTASIS_TESTING_SSO_NONE,
 +                                        "policy-create-1",
                                          NULL),
 -
 +    /*
      ANASTASIS_TESTING_cmd_recover_secret ("recover-secret-1",
                                            anastasis_url,
+                                           
ANASTASIS_TESTING_make_id_data_example (
+                                           "MaxMuster123456789"),
+                                           0,
                                            MHD_HTTP_PAYMENT_REQUIRED,
                                            ANASTASIS_TESTING_RSO_NONE,
-                                           NULL),
+                                           salt-request-1),
      */
  
      TALER_TESTING_cmd_end ()

-- 
To stop receiving notification emails like this one, please contact
address@hidden.